diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2008-06-07 16:23:42 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2008-06-07 16:23:42 +0200 |
| commit | ef9395f5ffe75f4e43d80cd1fa7b34c8a4db66fe (patch) | |
| tree | 8cc2dd0502a838489925e68861f0542183c177c9 /test | |
| parent | 24effa4861d6d1e8cffe848ae63fa2ed40be03f6 (diff) | |
| parent | 9aa93b5890acb152c5824a8f75c221cf1addfd1b (diff) | |
| download | gitpython-ef9395f5ffe75f4e43d80cd1fa7b34c8a4db66fe.tar.gz | |
Merge branch 'master' of git://gitorious.org/git-python/mainline
Diffstat (limited to 'test')
| -rw-r--r-- | test/git/test_git.py | 4 | ||||
| -rw-r--r-- | test/testlib/helper.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/git/test_git.py b/test/git/test_git.py index b8fa734a..e452e68b 100644 --- a/test/git/test_git.py +++ b/test/git/test_git.py @@ -59,5 +59,5 @@ class TestGit(object): @patch(Git, 'execute') def test_it_ignores_false_kwargs(self, git): # this_should_not_be_ignored=False implies it *should* be ignored - output = self.git.version( pass_this_kwarg=False ) - assert_true( "pass_this_kwarg" not in git.call_args[1] ) + output = self.git.version(pass_this_kwarg=False) + assert_true("pass_this_kwarg" not in git.call_args[1]) diff --git a/test/testlib/helper.py b/test/testlib/helper.py index 0e3f6bf5..ccc7f0ac 100644 --- a/test/testlib/helper.py +++ b/test/testlib/helper.py @@ -3,7 +3,7 @@ import os GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) def fixture_path(name): - test_dir = os.path.dirname( os.path.dirname(__file__) ) + test_dir = os.path.dirname(os.path.dirname(__file__)) return os.path.join(test_dir, "fixtures", name) def fixture(name): |