Moving to pytest (wip)

Author: jdavid

test/conftest.py

@@ -16,6 +16,20 @@ def disable_global_git_config():
         pygit2.settings.search_path[level] = ""
 
 
+@pytest.fixture
+def barerepo():
+    repo_spec = 'git', 'testrepo.git'
+    with utils.TemporaryRepository(repo_spec) as path:
+        yield pygit2.Repository(path)
+
+
+@pytest.fixture
+def barerepo_path():
+    repo_spec = 'git', 'testrepo.git'
+    with utils.TemporaryRepository(repo_spec) as path:
+        yield pygit2.Repository(path), path
+
+
 @pytest.fixture
 def dirtyrepo():
     repo_spec = 'tar', 'dirtyrepo'

test/test_commit.py

@@ -36,102 +36,100 @@
 COMMIT_SHA = '5fe808e8953c12735680c257f56600cb0de44b10'
 
 
-class CommitTest(utils.BareRepoTestCase):
-
-    @utils.refcount
-    def test_commit_refcount(self):
-        commit = self.repo[COMMIT_SHA]
-        start = sys.getrefcount(commit)
-        tree = commit.tree
-        del tree
-        end = sys.getrefcount(commit)
-        assert start == end
-
-
-    def test_read_commit(self):
-        commit = self.repo[COMMIT_SHA]
-        assert COMMIT_SHA == str(commit.id)
-        parents = commit.parents
-        assert 1 == len(parents)
-        assert 'c2792cfa289ae6321ecf2cd5806c2194b0fd070c' == str(parents[0].id)
-        assert commit.message_encoding is None
-        assert commit.message == ('Second test data commit.\n\n'
-                                  'This commit has some additional text.\n')
-        commit_time = 1288481576
-        assert commit_time == commit.commit_time
-        assert commit.committer == Signature('Dave Borowitz', 'dborowitz@google.com', commit_time, -420)
-        assert commit.author == Signature('Dave Borowitz', 'dborowitz@google.com', 1288477363, -420)
-        assert '967fce8df97cc71722d3c2a5930ef3e6f1d27b12' == str(commit.tree.id)
-
-    def test_new_commit(self):
-        repo = self.repo
-        message = 'New commit.\n\nMessage with non-ascii chars: ééé.\n'
-        committer = Signature('John Doe', 'jdoe@example.com', 12346, 0)
-        author = Signature(
-            'J. David Ibáñez', 'jdavid@example.com', 12345, 0,
-            encoding='utf-8')
-        tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
-        tree_prefix = tree[:5]
-        too_short_prefix = tree[:3]
-
-        parents = [COMMIT_SHA[:5]]
-        with pytest.raises(ValueError):
-            repo.create_commit(None, author, committer, message, too_short_prefix, parents)
-
-        sha = repo.create_commit(None, author, committer, message,
-                                 tree_prefix, parents)
-        commit = repo[sha]
-
-        assert GIT_OBJ_COMMIT == commit.type
-        assert '98286caaab3f1fde5bf52c8369b2b0423bad743b' == commit.hex
-        assert commit.message_encoding is None
-        assert message == commit.message
-        assert 12346 == commit.commit_time
-        assert committer == commit.committer
-        assert author == commit.author
-        assert tree == commit.tree.hex
-        assert Oid(hex=tree) == commit.tree_id
-        assert 1 == len(commit.parents)
-        assert COMMIT_SHA == commit.parents[0].hex
-        assert Oid(hex=COMMIT_SHA) == commit.parent_ids[0]
-
-    def test_new_commit_encoding(self):
-        repo = self.repo
-        encoding = 'iso-8859-1'
-        message = 'New commit.\n\nMessage with non-ascii chars: ééé.\n'
-        committer = Signature('John Doe', 'jdoe@example.com', 12346, 0,
-                              encoding)
-        author = Signature('J. David Ibáñez', 'jdavid@example.com', 12345, 0,
-                           encoding)
-        tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
-        tree_prefix = tree[:5]
-
-        parents = [COMMIT_SHA[:5]]
-        sha = repo.create_commit(None, author, committer, message,
-                                 tree_prefix, parents, encoding)
-        commit = repo[sha]
-
-        assert GIT_OBJ_COMMIT == commit.type
-        assert 'iso-8859-1' == commit.message_encoding
-        assert message.encode(encoding) == commit.raw_message
-        assert 12346 == commit.commit_time
-        assert committer == commit.committer
-        assert author == commit.author
-        assert tree == commit.tree.hex
-        assert Oid(hex=tree) == commit.tree_id
-        assert 1 == len(commit.parents)
-        assert COMMIT_SHA == commit.parents[0].hex
-        assert Oid(hex=COMMIT_SHA) == commit.parent_ids[0]
-
-    def test_modify_commit(self):
-        message = 'New commit.\n\nMessage.\n'
-        committer = ('John Doe', 'jdoe@example.com', 12346)
-        author = ('Jane Doe', 'jdoe2@example.com', 12345)
-
-        commit = self.repo[COMMIT_SHA]
-
-        with pytest.raises(AttributeError): setattr(commit, 'message', message)
-        with pytest.raises(AttributeError): setattr(commit, 'committer', committer)
-        with pytest.raises(AttributeError): setattr(commit, 'author', author)
-        with pytest.raises(AttributeError): setattr(commit, 'tree', None)
-        with pytest.raises(AttributeError): setattr(commit, 'parents', None)
+@utils.refcount
+def test_commit_refcount(barerepo):
+    commit = barerepo[COMMIT_SHA]
+    start = sys.getrefcount(commit)
+    tree = commit.tree
+    del tree
+    end = sys.getrefcount(commit)
+    assert start == end
+
+
+def test_read_commit(barerepo):
+    commit = barerepo[COMMIT_SHA]
+    assert COMMIT_SHA == str(commit.id)
+    parents = commit.parents
+    assert 1 == len(parents)
+    assert 'c2792cfa289ae6321ecf2cd5806c2194b0fd070c' == str(parents[0].id)
+    assert commit.message_encoding is None
+    assert commit.message == ('Second test data commit.\n\n'
+                              'This commit has some additional text.\n')
+    commit_time = 1288481576
+    assert commit_time == commit.commit_time
+    assert commit.committer == Signature('Dave Borowitz', 'dborowitz@google.com', commit_time, -420)
+    assert commit.author == Signature('Dave Borowitz', 'dborowitz@google.com', 1288477363, -420)
+    assert '967fce8df97cc71722d3c2a5930ef3e6f1d27b12' == str(commit.tree.id)
+
+def test_new_commit(barerepo):
+    repo = barerepo
+    message = 'New commit.\n\nMessage with non-ascii chars: ééé.\n'
+    committer = Signature('John Doe', 'jdoe@example.com', 12346, 0)
+    author = Signature(
+        'J. David Ibáñez', 'jdavid@example.com', 12345, 0,
+        encoding='utf-8')
+    tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
+    tree_prefix = tree[:5]
+    too_short_prefix = tree[:3]
+
+    parents = [COMMIT_SHA[:5]]
+    with pytest.raises(ValueError):
+        repo.create_commit(None, author, committer, message, too_short_prefix, parents)
+
+    sha = repo.create_commit(None, author, committer, message,
+                             tree_prefix, parents)
+    commit = repo[sha]
+
+    assert GIT_OBJ_COMMIT == commit.type
+    assert '98286caaab3f1fde5bf52c8369b2b0423bad743b' == commit.hex
+    assert commit.message_encoding is None
+    assert message == commit.message
+    assert 12346 == commit.commit_time
+    assert committer == commit.committer
+    assert author == commit.author
+    assert tree == commit.tree.hex
+    assert Oid(hex=tree) == commit.tree_id
+    assert 1 == len(commit.parents)
+    assert COMMIT_SHA == commit.parents[0].hex
+    assert Oid(hex=COMMIT_SHA) == commit.parent_ids[0]
+
+def test_new_commit_encoding(barerepo):
+    repo = barerepo
+    encoding = 'iso-8859-1'
+    message = 'New commit.\n\nMessage with non-ascii chars: ééé.\n'
+    committer = Signature('John Doe', 'jdoe@example.com', 12346, 0,
+                          encoding)
+    author = Signature('J. David Ibáñez', 'jdavid@example.com', 12345, 0,
+                       encoding)
+    tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
+    tree_prefix = tree[:5]
+
+    parents = [COMMIT_SHA[:5]]
+    sha = repo.create_commit(None, author, committer, message,
+                             tree_prefix, parents, encoding)
+    commit = repo[sha]
+
+    assert GIT_OBJ_COMMIT == commit.type
+    assert 'iso-8859-1' == commit.message_encoding
+    assert message.encode(encoding) == commit.raw_message
+    assert 12346 == commit.commit_time
+    assert committer == commit.committer
+    assert author == commit.author
+    assert tree == commit.tree.hex
+    assert Oid(hex=tree) == commit.tree_id
+    assert 1 == len(commit.parents)
+    assert COMMIT_SHA == commit.parents[0].hex
+    assert Oid(hex=COMMIT_SHA) == commit.parent_ids[0]
+
+def test_modify_commit(barerepo):
+    message = 'New commit.\n\nMessage.\n'
+    committer = ('John Doe', 'jdoe@example.com', 12346)
+    author = ('Jane Doe', 'jdoe2@example.com', 12345)
+
+    commit = barerepo[COMMIT_SHA]
+
+    with pytest.raises(AttributeError): setattr(commit, 'message', message)
+    with pytest.raises(AttributeError): setattr(commit, 'committer', committer)
+    with pytest.raises(AttributeError): setattr(commit, 'author', author)
+    with pytest.raises(AttributeError): setattr(commit, 'tree', None)
+    with pytest.raises(AttributeError): setattr(commit, 'parents', None)

test/test_config.py

@@ -106,10 +106,10 @@ def test_read(self):
 
         with pytest.raises(TypeError): config[()]
         with pytest.raises(TypeError): config[-4]
-        self.assertRaisesWithArg(ValueError, "invalid config item name 'abc'",
-                                 lambda: config['abc'])
-        self.assertRaisesWithArg(KeyError, 'abc.def',
-                                 lambda: config['abc.def'])
+        utils.assertRaisesWithArg(ValueError, "invalid config item name 'abc'",
+                                  lambda: config['abc'])
+        utils.assertRaisesWithArg(KeyError, 'abc.def',
+                                  lambda: config['abc.def'])
 
         assert 'core.bare' in config
         assert not config.get_bool('core.bare')