Skip to content

Add 'sshkey' context manager #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 22, 2015
Merged

Add 'sshkey' context manager #242

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1287f69
Fix some typos
teeberg Jan 21, 2015
261aedd
Add 'sshkey' context manager
teeberg Jan 21, 2015
34c0831
Add method to query environment
teeberg Jan 22, 2015
2a9b2f2
Rename 'environment' and 'set_environment'
teeberg Jan 22, 2015
98a17a2
Add SSH wrapper to MANIFEST.in
teeberg Jan 22, 2015
6f03861
Add a few tests
teeberg Jan 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add a few tests
  • Loading branch information
@teeberg
teeberg committed Jan 22, 2015
commit 6f038611ff120f8283f0f1a56962f95b66730c72
20 changes: 20 additions & 0 deletions git/test/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,23 @@ def test_env_vars_passed_to_git(self):
editor = 'non_existant_editor'
with mock.patch.dict('os.environ', {'GIT_EDITOR': editor}):
assert self.git.var("GIT_EDITOR") == editor

def test_environment(self):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see how I could test the sshkey context manager without accessing an actual repo. Also, how could I check whether the environment is actually passed into the git process? The former would cover the latter. Do you have ideas?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something that could work is to adjust the script for the test to actually fail with a distinct error code, and possibly emit something distinctive to STDERR.
That way, you could call the real git process, on a bogus git@server:foo/bar repo URL, and verify that it failed under your conditions. That can proof that the script was actually called.
The cool thing is that this would require you to put in a way to adjust the path the script handling the GIT_SSH, which could be done so that advanced users can either set it, or derive from the Git command implementation.

# sanity check
assert self.git.environment() == {}

# make sure the context manager works and cleans up after itself
with self.git.with_environment(PWD='/tmp'):
assert self.git.environment() == {'PWD': '/tmp'}

assert self.git.environment() == {}

old_env = self.git.update_environment(VARKEY='VARVALUE')
# The returned dict can be used to revert the change, hence why it has
# an entry with value 'None'.
assert old_env == {'VARKEY': None}
assert self.git.environment() == {'VARKEY': 'VARVALUE'}

new_env = self.git.update_environment(**old_env)
assert new_env == {'VARKEY': 'VARVALUE'}
assert self.git.environment() == {}