From f573b6840509bf41be822ab7ed79e0a776005133 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sun, 9 Feb 2014 21:09:00 +0100 Subject: tabs to 4 spaces - this won't make integrating the patches easier, but it's probably a good idea to go a little more pep8 (and fix sins of my youth ;) ) --- git/test/performance/lib.py | 92 ++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'git/test/performance/lib.py') diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index d0727b60..778a6c7d 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -5,13 +5,13 @@ import shutil import tempfile from git.db import ( - GitCmdObjectDB, - GitDB - ) + GitCmdObjectDB, + GitDB + ) from git import ( - Repo - ) + Repo + ) #{ Invvariants k_env_git_repo = "GIT_PYTHON_TEST_GIT_REPO_BASE" @@ -20,12 +20,12 @@ k_env_git_repo = "GIT_PYTHON_TEST_GIT_REPO_BASE" #{ Utilities def resolve_or_fail(env_var): - """:return: resolved environment variable or raise EnvironmentError""" - try: - return os.environ[env_var] - except KeyError: - raise EnvironmentError("Please set the %r envrionment variable and retry" % env_var) - # END exception handling + """:return: resolved environment variable or raise EnvironmentError""" + try: + return os.environ[env_var] + except KeyError: + raise EnvironmentError("Please set the %r envrionment variable and retry" % env_var) + # END exception handling #} END utilities @@ -33,46 +33,46 @@ def resolve_or_fail(env_var): #{ Base Classes class TestBigRepoR(TestBase): - """TestCase providing access to readonly 'big' repositories using the following - member variables: - - * gitrorepo - - * Read-Only git repository - actually the repo of git itself - + """TestCase providing access to readonly 'big' repositories using the following + member variables: + + * gitrorepo + + * Read-Only git repository - actually the repo of git itself + * puregitrorepo * As gitrepo, but uses pure python implementation """ - - #{ Invariants - head_sha_2k = '235d521da60e4699e5bd59ac658b5b48bd76ddca' - head_sha_50 = '32347c375250fd470973a5d76185cac718955fd5' - #} END invariants - - @classmethod - def setUpAll(cls): - super(TestBigRepoR, cls).setUpAll() - repo_path = resolve_or_fail(k_env_git_repo) - cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB) - cls.puregitrorepo = Repo(repo_path, odbt=GitDB) + + #{ Invariants + head_sha_2k = '235d521da60e4699e5bd59ac658b5b48bd76ddca' + head_sha_50 = '32347c375250fd470973a5d76185cac718955fd5' + #} END invariants + + @classmethod + def setUpAll(cls): + super(TestBigRepoR, cls).setUpAll() + repo_path = resolve_or_fail(k_env_git_repo) + cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB) + cls.puregitrorepo = Repo(repo_path, odbt=GitDB) class TestBigRepoRW(TestBigRepoR): - """As above, but provides a big repository that we can write to. - - Provides ``self.gitrwrepo`` and ``self.puregitrwrepo``""" - - @classmethod - def setUpAll(cls): - super(TestBigRepoRW, cls).setUpAll() - dirname = tempfile.mktemp() - os.mkdir(dirname) - cls.gitrwrepo = cls.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB) - cls.puregitrwrepo = Repo(dirname, odbt=GitDB) - - @classmethod - def tearDownAll(cls): - shutil.rmtree(cls.gitrwrepo.working_dir) - + """As above, but provides a big repository that we can write to. + + Provides ``self.gitrwrepo`` and ``self.puregitrwrepo``""" + + @classmethod + def setUpAll(cls): + super(TestBigRepoRW, cls).setUpAll() + dirname = tempfile.mktemp() + os.mkdir(dirname) + cls.gitrwrepo = cls.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB) + cls.puregitrwrepo = Repo(dirname, odbt=GitDB) + + @classmethod + def tearDownAll(cls): + shutil.rmtree(cls.gitrwrepo.working_dir) + #} END base classes -- cgit v1.2.1 From e4654ca3a17832a7d479e5d8e3296f004c632183 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 10 Feb 2014 19:37:33 +0100 Subject: Adjusted required versions of pre-requisites, now the majority of the tests work --- git/test/performance/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git/test/performance/lib.py') diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index 778a6c7d..89105334 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -51,7 +51,7 @@ class TestBigRepoR(TestBase): #} END invariants @classmethod - def setUpAll(cls): + def setUp(cls): super(TestBigRepoR, cls).setUpAll() repo_path = resolve_or_fail(k_env_git_repo) cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB) @@ -64,7 +64,7 @@ class TestBigRepoRW(TestBigRepoR): Provides ``self.gitrwrepo`` and ``self.puregitrwrepo``""" @classmethod - def setUpAll(cls): + def setUp(cls): super(TestBigRepoRW, cls).setUpAll() dirname = tempfile.mktemp() os.mkdir(dirname) -- cgit v1.2.1 From dbe78c02cbdfd0a539a1e04976e1480ac0daf580 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 10 Feb 2014 19:59:56 +0100 Subject: Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it --- git/test/performance/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git/test/performance/lib.py') diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index 89105334..d8313dac 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -52,7 +52,7 @@ class TestBigRepoR(TestBase): @classmethod def setUp(cls): - super(TestBigRepoR, cls).setUpAll() + super(TestBigRepoR, cls).setUp() repo_path = resolve_or_fail(k_env_git_repo) cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB) cls.puregitrorepo = Repo(repo_path, odbt=GitDB) @@ -65,7 +65,7 @@ class TestBigRepoRW(TestBigRepoR): @classmethod def setUp(cls): - super(TestBigRepoRW, cls).setUpAll() + super(TestBigRepoRW, cls).setUp() dirname = tempfile.mktemp() os.mkdir(dirname) cls.gitrwrepo = cls.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB) -- cgit v1.2.1