Skip to content

Commit 00e0d7a

Browse files
committed
Fix test broken under Python 2.7 unittest.
1 parent 0e90a8f commit 00e0d7a

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

git/test/db/lib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class TestDBBase(TestBase):
6464
#} END configuration
6565

6666
@classmethod
67-
def setUpAll(cls):
67+
def setUpClass(cls):
6868
"""
6969
Dynamically add a read-only repository to our actual type. This way
7070
each test type has its own repository

git/test/lib/helper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class TestBase(TestCase):
292292
"""
293293

294294
@classmethod
295-
def setUpAll(cls):
295+
def setUpClass(cls):
296296
"""This method is only called to provide the most basic functionality
297297
Subclasses may just override it or implement it differently"""
298298
cls.rorepo = Repo(rorepo_dir())

git/test/performance/db/looseodb_impl.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ class TestLooseDBWPerformanceBase(TestBigRepoR):
6060
#} END configuration
6161

6262
@classmethod
63-
def setUpAll(cls):
64-
super(TestLooseDBWPerformanceBase, cls).setUpAll()
63+
def setUpClass(cls):
64+
super(TestLooseDBWPerformanceBase, cls).setUpClass()
6565
if cls.LooseODBCls is None:
6666
raise AssertionError("LooseODBCls must be set in subtype")
6767
#END assert configuration

git/test/performance/db/packedodb_impl.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class TestPurePackedODBPerformanceBase(TestBigRepoR):
2727
#} END configuration
2828

2929
@classmethod
30-
def setUpAll(cls):
31-
super(TestPurePackedODBPerformanceBase, cls).setUpAll()
30+
def setUpClass(cls):
31+
super(TestPurePackedODBPerformanceBase, cls).setUpClass()
3232
if cls.PackedODBCls is None:
3333
raise AssertionError("PackedODBCls must be set in subclass")
3434
#END assert configuration

git/test/performance/lib.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class TestBigRepoR(TestBase):
4747
#} END configuration
4848

4949
@classmethod
50-
def setUpAll(cls):
51-
super(TestBigRepoR, cls).setUpAll()
50+
def setUpClass(cls):
51+
super(TestBigRepoR, cls).setUpClass()
5252
if cls.RepoCls is None:
5353
raise AssertionError("Require RepoCls in class %s to be set" % cls)
5454
#END assert configuration
@@ -61,8 +61,8 @@ class TestBigRepoRW(TestBigRepoR):
6161
Provides ``self.rwrepo``"""
6262

6363
@classmethod
64-
def setUpAll(cls):
65-
super(TestBigRepoRW, cls).setUpAll()
64+
def setUpClass(cls):
65+
super(TestBigRepoRW, cls).setUpClass()
6666
dirname = tempfile.mktemp()
6767
os.mkdir(dirname)
6868
cls.rwrepo = cls.rorepo.clone(dirname, shared=True, bare=True)

git/test/test_cmd.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
class TestGit(TestBase):
2020

2121
@classmethod
22-
def setUpAll(cls):
23-
super(TestGit, cls).setUpAll()
22+
def setUpClass(cls):
23+
super(TestGit, cls).setUpClass()
2424
cls.git = Git(cls.rorepo.working_dir)
2525

2626
@patch_object(Git, 'execute')

0 commit comments

Comments
 (0)