From 00e0d7a5500de03602b6ebab348ad849c75f6ab5 Mon Sep 17 00:00:00 2001 From: "Marcus R. Brown" Date: Thu, 10 Jan 2013 23:34:18 -0700 Subject: [PATCH 1/2] Fix test broken under Python 2.7 unittest. --- git/test/db/lib.py | 2 +- git/test/lib/helper.py | 2 +- git/test/performance/db/looseodb_impl.py | 4 ++-- git/test/performance/db/packedodb_impl.py | 4 ++-- git/test/performance/lib.py | 8 ++++---- git/test/test_cmd.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/git/test/db/lib.py b/git/test/db/lib.py index 2b3ddde56..77ab8db1b 100644 --- a/git/test/db/lib.py +++ b/git/test/db/lib.py @@ -64,7 +64,7 @@ class TestDBBase(TestBase): #} END configuration @classmethod - def setUpAll(cls): + def setUpClass(cls): """ Dynamically add a read-only repository to our actual type. This way each test type has its own repository diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py index 2045f9d39..dfae5814d 100644 --- a/git/test/lib/helper.py +++ b/git/test/lib/helper.py @@ -292,7 +292,7 @@ class TestBase(TestCase): """ @classmethod - def setUpAll(cls): + def setUpClass(cls): """This method is only called to provide the most basic functionality Subclasses may just override it or implement it differently""" cls.rorepo = Repo(rorepo_dir()) diff --git a/git/test/performance/db/looseodb_impl.py b/git/test/performance/db/looseodb_impl.py index 6d3c1fa60..86e81e38f 100644 --- a/git/test/performance/db/looseodb_impl.py +++ b/git/test/performance/db/looseodb_impl.py @@ -60,8 +60,8 @@ class TestLooseDBWPerformanceBase(TestBigRepoR): #} END configuration @classmethod - def setUpAll(cls): - super(TestLooseDBWPerformanceBase, cls).setUpAll() + def setUpClass(cls): + super(TestLooseDBWPerformanceBase, cls).setUpClass() if cls.LooseODBCls is None: raise AssertionError("LooseODBCls must be set in subtype") #END assert configuration diff --git a/git/test/performance/db/packedodb_impl.py b/git/test/performance/db/packedodb_impl.py index b95a8d13f..07cdc3c87 100644 --- a/git/test/performance/db/packedodb_impl.py +++ b/git/test/performance/db/packedodb_impl.py @@ -27,8 +27,8 @@ class TestPurePackedODBPerformanceBase(TestBigRepoR): #} END configuration @classmethod - def setUpAll(cls): - super(TestPurePackedODBPerformanceBase, cls).setUpAll() + def setUpClass(cls): + super(TestPurePackedODBPerformanceBase, cls).setUpClass() if cls.PackedODBCls is None: raise AssertionError("PackedODBCls must be set in subclass") #END assert configuration diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index 758d402df..c881fbbe9 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -47,8 +47,8 @@ class TestBigRepoR(TestBase): #} END configuration @classmethod - def setUpAll(cls): - super(TestBigRepoR, cls).setUpAll() + def setUpClass(cls): + super(TestBigRepoR, cls).setUpClass() if cls.RepoCls is None: raise AssertionError("Require RepoCls in class %s to be set" % cls) #END assert configuration @@ -61,8 +61,8 @@ class TestBigRepoRW(TestBigRepoR): Provides ``self.rwrepo``""" @classmethod - def setUpAll(cls): - super(TestBigRepoRW, cls).setUpAll() + def setUpClass(cls): + super(TestBigRepoRW, cls).setUpClass() dirname = tempfile.mktemp() os.mkdir(dirname) cls.rwrepo = cls.rorepo.clone(dirname, shared=True, bare=True) diff --git a/git/test/test_cmd.py b/git/test/test_cmd.py index b57323398..4de70f43c 100644 --- a/git/test/test_cmd.py +++ b/git/test/test_cmd.py @@ -19,8 +19,8 @@ class TestGit(TestBase): @classmethod - def setUpAll(cls): - super(TestGit, cls).setUpAll() + def setUpClass(cls): + super(TestGit, cls).setUpClass() cls.git = Git(cls.rorepo.working_dir) @patch_object(Git, 'execute') From 951bf8cd972646943a1e79ec70fc7ea36ff8dcd0 Mon Sep 17 00:00:00 2001 From: "Marcus R. Brown" Date: Fri, 11 Jan 2013 01:39:42 -0700 Subject: [PATCH 2/2] Rename tearDownAll to tearDownClass() for Python 2.7 compatibility. --- git/test/performance/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py index c881fbbe9..25a64f2a2 100644 --- a/git/test/performance/lib.py +++ b/git/test/performance/lib.py @@ -68,7 +68,7 @@ def setUpClass(cls): cls.rwrepo = cls.rorepo.clone(dirname, shared=True, bare=True) @classmethod - def tearDownAll(cls): + def tearDownClass(cls): shutil.rmtree(cls.rwrepo.working_dir) #} END base classes