Skip to content

Fix test broken under Python 2.7 unittest. #87

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.

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

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion git/test/db/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion git/test/lib/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions git/test/performance/db/looseodb_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions git/test/performance/db/packedodb_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions git/test/performance/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -61,14 +61,14 @@ 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)

@classmethod
def tearDownAll(cls):
def tearDownClass(cls):
shutil.rmtree(cls.rwrepo.working_dir)

#} END base classes
4 changes: 2 additions & 2 deletions git/test/test_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down