Adjusted all remaining test suites to use the new TestBase class where appropriate

Author: Byron

test/git/test_blob.py

@@ -7,26 +7,24 @@
 from test.testlib import *
 from git import *
 
-class TestBlob(object):
-	def setup(self):
-		self.repo = Repo(GIT_REPO)
+class TestBlob(TestBase):
 
 	def test_should_cache_data(self):
 		bid = 'a802c139d4767c89dcad79d836d05f7004d39aac'
-		blob = Blob(self.repo, bid)
+		blob = Blob(self.rorepo, bid)
 		blob.data
 		assert blob.data
 		blob.size
 		blob.size
 
 	def test_mime_type_should_return_mime_type_for_known_types(self):
-		blob = Blob(self.repo, **{'id': 'abc', 'path': 'foo.png'})
+		blob = Blob(self.rorepo, **{'id': 'abc', 'path': 'foo.png'})
 		assert_equal("image/png", blob.mime_type)
 
 	def test_mime_type_should_return_text_plain_for_unknown_types(self):
-		blob = Blob(self.repo, **{'id': 'abc','path': 'something'})
+		blob = Blob(self.rorepo, **{'id': 'abc','path': 'something'})
 		assert_equal("text/plain", blob.mime_type)
 
 	def test_should_return_appropriate_representation(self):
-		blob = Blob(self.repo, **{'id': 'abc'})
+		blob = Blob(self.rorepo, **{'id': 'abc'})
 		assert_equal('<git.Blob "abc">', repr(blob))

test/git/test_commit.py

@@ -7,21 +7,19 @@
 from test.testlib import *
 from git import *
 
-class TestCommit(object):
-	def setup(self):
-		self.repo = Repo(GIT_REPO)
+class TestCommit(TestBase):
 
 	def test_bake(self):
 
-		commit = Commit(self.repo, **{'id': '2454ae89983a4496a445ce347d7a41c0bb0ea7ae'})
+		commit = Commit(self.rorepo, **{'id': '2454ae89983a4496a445ce347d7a41c0bb0ea7ae'})
 		commit.author # bake
 
 		assert_equal("Sebastian Thiel", commit.author.name)
 		assert_equal("byronimo@gmail.com", commit.author.email)
 
 
 	def test_stats(self):
-		commit = Commit(self.repo, id='33ebe7acec14b25c5f84f35a664803fcab2f7781')
+		commit = Commit(self.rorepo, id='33ebe7acec14b25c5f84f35a664803fcab2f7781')
 		stats = commit.stats
 
 		def check_entries(d):
@@ -48,13 +46,13 @@ def test_rev_list_bisect_all(self, git):
 
 		git.return_value = fixture('rev_list_bisect_all')
 
-		revs = self.repo.git.rev_list('HEAD',
+		revs = self.rorepo.git.rev_list('HEAD',
 									  pretty='raw',
 									  first_parent=True,
 									  bisect_all=True)
 		assert_true(git.called)
 
-		commits = Commit._iter_from_process_or_stream(self.repo, ListProcessAdapter(revs))
+		commits = Commit._iter_from_process_or_stream(self.rorepo, ListProcessAdapter(revs))
 		expected_ids = (
 			'cf37099ea8d1d8c7fbf9b6d12d7ec0249d3acb8b',
 			'33ebe7acec14b25c5f84f35a664803fcab2f7781',
@@ -66,29 +64,29 @@ def test_rev_list_bisect_all(self, git):
 			assert_equal(sha1, commit.id)
 
 	def test_count(self):
-		assert self.repo.tag('0.1.5').commit.count( ) == 141
+		assert self.rorepo.tag('0.1.5').commit.count( ) == 141
 
 	def test_list(self):
-		assert isinstance(Commit.list_items(self.repo, '0.1.5', max_count=5)['5117c9c8a4d3af19a9958677e45cda9269de1541'], Commit)
+		assert isinstance(Commit.list_items(self.rorepo, '0.1.5', max_count=5)['5117c9c8a4d3af19a9958677e45cda9269de1541'], Commit)
 
 	def test_str(self):
-		commit = Commit(self.repo, id='abc')
+		commit = Commit(self.rorepo, id='abc')
 		assert_equal ("abc", str(commit))
 
 	def test_repr(self):
-		commit = Commit(self.repo, id='abc')
+		commit = Commit(self.rorepo, id='abc')
 		assert_equal('<git.Commit "abc">', repr(commit))
 
 	def test_equality(self):
-		commit1 = Commit(self.repo, id='abc')
-		commit2 = Commit(self.repo, id='abc')
-		commit3 = Commit(self.repo, id='zyx')
+		commit1 = Commit(self.rorepo, id='abc')
+		commit2 = Commit(self.rorepo, id='abc')
+		commit3 = Commit(self.rorepo, id='zyx')
 		assert_equal(commit1, commit2)
 		assert_not_equal(commit2, commit3)
 
 	def test_iter_parents(self):
 		# should return all but ourselves, even if skip is defined
-		c = self.repo.commit('0.1.5')
+		c = self.rorepo.commit('0.1.5')
 		for skip in (0, 1):
 			piter = c.iter_parents(skip=skip)
 			first_parent = piter.next()

test/git/test_config.py

@@ -11,10 +11,6 @@
 
 class TestBase(TestCase):
 
-	@classmethod
-	def setUpAll(cls):
-		cls.repo = Repo(GIT_REPO)
-		
 	def _to_memcache(self, file_path):
 		fp = open(file_path, "r")
 		sio = StringIO.StringIO()

test/git/test_diff.py

@@ -7,19 +7,17 @@
 from test.testlib import *
 from git import *
 
-class TestDiff(TestCase):
-	def setUp(self):
-		self.repo = Repo(GIT_REPO)
-
+class TestDiff(TestBase):
+	
 	def test_list_from_string_new_mode(self):
 		output = ListProcessAdapter(fixture('diff_new_mode'))
-		diffs = Diff._index_from_patch_format(self.repo, output.stdout)
+		diffs = Diff._index_from_patch_format(self.rorepo, output.stdout)
 		assert_equal(1, len(diffs))
 		assert_equal(10, len(diffs[0].diff.splitlines()))
 
 	def test_diff_with_rename(self):
 		output = ListProcessAdapter(fixture('diff_rename'))
-		diffs = Diff._index_from_patch_format(self.repo, output.stdout)
+		diffs = Diff._index_from_patch_format(self.rorepo, output.stdout)
 
 		assert_equal(1, len(diffs))
 
@@ -37,13 +35,13 @@ def test_diff_patch_format(self):
 
 		for fixture_name in fixtures:
 			diff_proc = ListProcessAdapter(fixture(fixture_name))
-			diffs = Diff._index_from_patch_format(self.repo, diff_proc.stdout)
+			diffs = Diff._index_from_patch_format(self.rorepo, diff_proc.stdout)
 		# END for each fixture
 
 	def test_diff_interface(self):
 		# test a few variations of the main diff routine
 		assertion_map = dict()
-		for i, commit in enumerate(self.repo.iter_commits('0.1.6', max_count=10)):
+		for i, commit in enumerate(self.rorepo.iter_commits('0.1.6', max_count=10)):
 			diff_item = commit
 			if i%2 == 0:
 				diff_item = commit.tree

test/git/test_git.py

@@ -8,9 +8,11 @@
 from test.testlib import *
 from git import Git, GitCommandError
 
-class TestGit(object):
-	def setup(self):
-		self.git = Git(GIT_REPO)
+class TestGit(TestCase):
+	
+	@classmethod
+	def setUpAll(cls):
+		cls.git = Git(GIT_REPO)
 
 	@patch_object(Git, 'execute')
 	def test_call_process_calls_execute(self, git):

test/git/test_head.py

@@ -7,20 +7,18 @@
 from test.testlib import *
 from git import *
 
-class TestHead(object):
-	def setup(self):
-		self.repo = Repo(GIT_REPO)
+class TestHead(TestBase):
 
 	def test_base(self):
-		for head in self.repo.heads:
+		for head in self.rorepo.heads:
 			assert head.name
 			assert "refs/heads" in head.path
 		# END for each head
 
 	@patch_object(Git, '_call_process')
 	def test_ref_with_path_component(self, git):
 		git.return_value = fixture('for_each_ref_with_path_component')
-		head = self.repo.heads[0]
+		head = self.rorepo.heads[0]
 
 		assert_equal('refactoring/feature1', head.name)
 		assert_true(git.called)

test/git/test_index.py

@@ -10,15 +10,11 @@
 import os
 import tempfile
 
-class TestTree(TestCase):
+class TestTree(TestBase):
 
-	@classmethod
-	def setUpAll(cls):
-		cls.repo = Repo(GIT_REPO)
-		
 	def test_base(self):
 		# read from file
-		index = Index.from_file(self.repo, fixture_path("index"))
+		index = Index.from_file(self.rorepo, fixture_path("index"))
 		assert index.entries
 		assert index.version > 0
 
@@ -31,7 +27,7 @@ def test_base(self):
 		# END for each method
 
 		# test stage
-		index_merge = Index.from_file(self.repo, fixture_path("index_merge"))
+		index_merge = Index.from_file(self.rorepo, fixture_path("index_merge"))
 		assert len(index_merge.entries) == 106
 		assert len(list(e for e in index_merge.entries.itervalues() if e.stage != 0 ))
 
@@ -50,7 +46,7 @@ def test_base(self):
 	def _cmp_tree_index(self, tree, index):
 		# fail unless both objects contain the same paths and blobs
 		if isinstance(tree, str):
-			tree = self.repo.commit(tree).tree
+			tree = self.rorepo.commit(tree).tree
 
 		num_blobs = 0
 		for blob in tree.traverse(predicate = lambda e: e.type == "blob"):
@@ -65,17 +61,17 @@ def test_from_tree(self):
 		other_sha = "39f85c4358b7346fee22169da9cad93901ea9eb9"
 
 		# simple index from tree 
-		base_index = Index.from_tree(self.repo, common_ancestor_sha)
+		base_index = Index.from_tree(self.rorepo, common_ancestor_sha)
 		assert base_index.entries
 		self._cmp_tree_index(common_ancestor_sha, base_index)
 
 		# merge two trees - its like a fast-forward
-		two_way_index = Index.from_tree(self.repo, common_ancestor_sha, cur_sha)
+		two_way_index = Index.from_tree(self.rorepo, common_ancestor_sha, cur_sha)
 		assert two_way_index.entries
 		self._cmp_tree_index(cur_sha, two_way_index)
 
 		# merge three trees - here we have a merge conflict
-		three_way_index = Index.from_tree(self.repo, common_ancestor_sha, cur_sha, other_sha)
+		three_way_index = Index.from_tree(self.rorepo, common_ancestor_sha, cur_sha, other_sha)
 		assert len(list(e for e in three_way_index.entries.values() if e.stage != 0))
 
 

test/git/test_performance.py

@@ -8,9 +8,7 @@
 from git import *
 from time import time
 
-class TestPerformance(object):
-	def setup(self):
-		self.repo = Repo(GIT_REPO)
+class TestPerformance(TestBase):
 
 	def test_iteration(self):
 		num_objs = 0
@@ -21,7 +19,7 @@ def test_iteration(self):
 		# return quite a lot of commits, we just take one and hence abort the operation
 
 		st = time()
-		for c in self.repo.iter_commits('0.1.6'):
+		for c in self.rorepo.iter_commits('0.1.6'):
 			num_commits += 1
 			c.author
 			c.authored_date