Moving to pytest (wip)

Author: jdavid

test/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 import pygit2
+from . import utils
 
 
 @pytest.fixture(scope='session', autouse=True)
@@ -13,3 +14,24 @@ def disable_global_git_config():
               pygit2.GIT_CONFIG_LEVEL_SYSTEM]
     for level in levels:
         pygit2.settings.search_path[level] = ""
+
+
+@pytest.fixture
+def dirtyrepo():
+    repo_spec = 'tar', 'dirtyrepo'
+    with utils.TemporaryRepository(repo_spec) as path:
+        yield pygit2.Repository(path)
+
+
+@pytest.fixture
+def emptyrepo():
+    repo_spec = 'tar', 'emptyrepo'
+    with utils.TemporaryRepository(repo_spec) as path:
+        yield pygit2.Repository(path)
+
+
+@pytest.fixture
+def mergerepo():
+    repo_spec = 'tar', 'testrepoformerging'
+    with utils.TemporaryRepository(repo_spec) as path:
+        yield pygit2.Repository(path)

test/test_branch.py

@@ -137,56 +137,6 @@ def test_with_commit(self):
         assert sorted(branches) == []
 
 
-class BranchesObjectEmptyRepoTestCase(utils.EmptyRepoTestCase):
-    def setUp(self):
-        super(utils.EmptyRepoTestCase, self).setUp()
-
-        remote = self.repo.remotes[0]
-        remote.fetch()
-
-    def test_lookup_branch_remote(self):
-        branch = self.repo.branches.remote.get('origin/master')
-        assert branch.target.hex == ORIGIN_MASTER_COMMIT
-
-        assert self.repo.branches.remote.get('origin/not-exists') is None
-
-    def test_listall_branches(self):
-        branches = sorted(self.repo.branches.remote)
-        assert branches == ['origin/master']
-
-    def test_branch_remote_name(self):
-        self.repo.remotes[0].fetch()
-        branch = self.repo.branches.remote['origin/master']
-        assert branch.remote_name == 'origin'
-
-    def test_branch_upstream(self):
-        self.repo.remotes[0].fetch()
-        remote_master = self.repo.branches.remote['origin/master']
-        master = self.repo.branches.create('master',
-                                           self.repo[remote_master.target.hex])
-
-        assert master.upstream is None
-        master.upstream = remote_master
-        assert master.upstream.branch_name == 'origin/master'
-
-        def set_bad_upstream():
-            master.upstream = 2.5
-
-        with pytest.raises(TypeError): set_bad_upstream()
-
-        master.upstream = None
-        assert master.upstream is None
-
-    def test_branch_upstream_name(self):
-        self.repo.remotes[0].fetch()
-        remote_master = self.repo.branches.remote['origin/master']
-        master = self.repo.branches.create('master',
-                                           self.repo[remote_master.target.hex])
-
-        master.upstream = remote_master
-        assert master.upstream_name == 'refs/remotes/origin/master'
-
-
 class BranchesTestCase(utils.RepoTestCase):
     def test_lookup_branch_local(self):
         branch = self.repo.lookup_branch('master')
@@ -274,57 +224,3 @@ def test_branch_name(self):
         branch = self.repo.lookup_branch('i18n')
         assert branch.branch_name == 'i18n'
         assert branch.name == 'refs/heads/i18n'
-
-
-class BranchesEmptyRepoTestCase(utils.EmptyRepoTestCase):
-    def setUp(self):
-        super(utils.EmptyRepoTestCase, self).setUp()
-
-        remote = self.repo.remotes[0]
-        remote.fetch()
-
-    def test_lookup_branch_remote(self):
-        branch = self.repo.lookup_branch('origin/master',
-                                         pygit2.GIT_BRANCH_REMOTE)
-        assert branch.target.hex == ORIGIN_MASTER_COMMIT
-
-        assert self.repo.lookup_branch('origin/not-exists', pygit2.GIT_BRANCH_REMOTE) is None
-
-    def test_listall_branches(self):
-        branches = sorted(self.repo.listall_branches(pygit2.GIT_BRANCH_REMOTE))
-        assert branches == ['origin/master']
-
-    def test_branch_remote_name(self):
-        self.repo.remotes[0].fetch()
-        branch = self.repo.lookup_branch('origin/master',
-                                         pygit2.GIT_BRANCH_REMOTE)
-        assert branch.remote_name == 'origin'
-
-    def test_branch_upstream(self):
-        self.repo.remotes[0].fetch()
-        remote_master = self.repo.lookup_branch('origin/master',
-                                                pygit2.GIT_BRANCH_REMOTE)
-        master = self.repo.create_branch('master',
-                                         self.repo[remote_master.target.hex])
-
-        assert master.upstream is None
-        master.upstream = remote_master
-        assert master.upstream.branch_name == 'origin/master'
-
-        def set_bad_upstream():
-            master.upstream = 2.5
-
-        with pytest.raises(TypeError): set_bad_upstream()
-
-        master.upstream = None
-        assert master.upstream is None
-
-    def test_branch_upstream_name(self):
-        self.repo.remotes[0].fetch()
-        remote_master = self.repo.lookup_branch('origin/master',
-                                                pygit2.GIT_BRANCH_REMOTE)
-        master = self.repo.create_branch('master',
-                                         self.repo[remote_master.target.hex])
-
-        master.upstream = remote_master
-        assert master.upstream_name == 'refs/remotes/origin/master'

test/test_branch_empty.py

@@ -0,0 +1,119 @@
+# Copyright 2010-2020 The pygit2 contributors
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2,
+# as published by the Free Software Foundation.
+#
+# In addition to the permissions in the GNU General Public License,
+# the authors give you unlimited permission to link the compiled
+# version of this file into combinations with other programs,
+# and to distribute those combinations without any restriction
+# coming from the use of this file.  (The General Public License
+# restrictions do apply in other respects; for example, they cover
+# modification of the file, and distribution when not linked into
+# a combined executable.)
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+import pygit2
+import pytest
+
+
+ORIGIN_MASTER_COMMIT = '784855caf26449a1914d2cf62d12b9374d76ae78'
+
+
+@pytest.fixture
+def repo(emptyrepo):
+    remote = emptyrepo.remotes[0]
+    remote.fetch()
+    yield emptyrepo
+
+
+def test_branches_remote_get(repo):
+    branch = repo.branches.remote.get('origin/master')
+    assert branch.target.hex == ORIGIN_MASTER_COMMIT
+
+    assert repo.branches.remote.get('origin/not-exists') is None
+
+def test_branches_remote(repo):
+    branches = sorted(repo.branches.remote)
+    assert branches == ['origin/master']
+
+def test_branches_remote_getitem(repo):
+    branch = repo.branches.remote['origin/master']
+    assert branch.remote_name == 'origin'
+
+def test_branches_upstream(repo):
+    remote_master = repo.branches.remote['origin/master']
+    master = repo.branches.create('master', repo[remote_master.target.hex])
+
+    assert master.upstream is None
+    master.upstream = remote_master
+    assert master.upstream.branch_name == 'origin/master'
+
+    def set_bad_upstream():
+        master.upstream = 2.5
+
+    with pytest.raises(TypeError): set_bad_upstream()
+
+    master.upstream = None
+    assert master.upstream is None
+
+
+def test_branches_upstream_name(repo):
+    remote_master = repo.branches.remote['origin/master']
+    master = repo.branches.create('master',
+                                       repo[remote_master.target.hex])
+
+    master.upstream = remote_master
+    assert master.upstream_name == 'refs/remotes/origin/master'
+
+
+#
+# Low level API written in C, repo.remotes call these.
+#
+
+def test_lookup_branch_remote(repo):
+    branch = repo.lookup_branch('origin/master', pygit2.GIT_BRANCH_REMOTE)
+    assert branch.target.hex == ORIGIN_MASTER_COMMIT
+
+    assert repo.lookup_branch('origin/not-exists', pygit2.GIT_BRANCH_REMOTE) is None
+
+def test_listall_branches(repo):
+    branches = sorted(repo.listall_branches(pygit2.GIT_BRANCH_REMOTE))
+    assert branches == ['origin/master']
+
+def test_branch_remote_name(repo):
+    branch = repo.lookup_branch('origin/master', pygit2.GIT_BRANCH_REMOTE)
+    assert branch.remote_name == 'origin'
+
+def test_branch_upstream(repo):
+    remote_master = repo.lookup_branch('origin/master', pygit2.GIT_BRANCH_REMOTE)
+    master = repo.create_branch('master', repo[remote_master.target.hex])
+
+    assert master.upstream is None
+    master.upstream = remote_master
+    assert master.upstream.branch_name == 'origin/master'
+
+    def set_bad_upstream():
+        master.upstream = 2.5
+
+    with pytest.raises(TypeError): set_bad_upstream()
+
+    master.upstream = None
+    assert master.upstream is None
+
+def test_branch_upstream_name(repo):
+    remote_master = repo.lookup_branch('origin/master', pygit2.GIT_BRANCH_REMOTE)
+    master = repo.create_branch('master', repo[remote_master.target.hex])
+
+    master.upstream = remote_master
+    assert master.upstream_name == 'refs/remotes/origin/master'

test/test_cherrypick.py

@@ -27,38 +27,33 @@
 
 import os
 
-import pytest
-
 import pygit2
-from . import utils
-
-
-class CherrypickTestBasic(utils.RepoTestCaseForMerging):
-
-    def test_cherrypick_none(self):
-        with pytest.raises(TypeError): self.repo.cherrypick(None)
-
-    def test_cherrypick_invalid_hex(self):
-        branch_head_hex = '12345678'
-        with pytest.raises(KeyError): self.repo.cherrypick(branch_head_hex)
-
-    def test_cherrypick_already_something_in_index(self):
-        branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
-        branch_oid = self.repo.get(branch_head_hex).id
-        with open(os.path.join(self.repo.workdir, 'inindex.txt'), 'w') as f:
-            f.write('new content')
-        self.repo.index.add('inindex.txt')
-        with pytest.raises(pygit2.GitError): self.repo.cherrypick(branch_oid)
+import pytest
 
-class CherrypickTestWithConflicts(utils.RepoTestCaseForMerging):
 
-    def test_cherrypick_remove_conflicts(self):
-        other_branch_tip = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
-        self.repo.cherrypick(other_branch_tip)
-        idx = self.repo.index
-        conflicts = idx.conflicts
-        assert conflicts is not None
-        conflicts['.gitignore']
-        del idx.conflicts['.gitignore']
-        with pytest.raises(KeyError): conflicts.__getitem__('.gitignore')
-        assert idx.conflicts is None
+def test_cherrypick_none(mergerepo):
+    with pytest.raises(TypeError): mergerepo.cherrypick(None)
+
+def test_cherrypick_invalid_hex(mergerepo):
+    branch_head_hex = '12345678'
+    with pytest.raises(KeyError): mergerepo.cherrypick(branch_head_hex)
+
+def test_cherrypick_already_something_in_index(mergerepo):
+    branch_head_hex = '03490f16b15a09913edb3a067a3dc67fbb8d41f1'
+    branch_oid = mergerepo.get(branch_head_hex).id
+    with open(os.path.join(mergerepo.workdir, 'inindex.txt'), 'w') as f:
+        f.write('new content')
+    mergerepo.index.add('inindex.txt')
+    with pytest.raises(pygit2.GitError): mergerepo.cherrypick(branch_oid)
+
+
+def test_cherrypick_remove_conflicts(mergerepo):
+    other_branch_tip = '1b2bae55ac95a4be3f8983b86cd579226d0eb247'
+    mergerepo.cherrypick(other_branch_tip)
+    idx = mergerepo.index
+    conflicts = idx.conflicts
+    assert conflicts is not None
+    conflicts['.gitignore']
+    del idx.conflicts['.gitignore']
+    with pytest.raises(KeyError): conflicts.__getitem__('.gitignore')
+    assert idx.conflicts is None

test/test_describe.py

@@ -90,14 +90,10 @@ def test_describe_long_format(self):
         assert 'thetag-0-g2be5719' == self.repo.describe(always_use_long_format=True)
 
 
-class DescribeDirtyWorkdirTest(utils.DirtyRepoTestCase):
+def test_describe(dirtyrepo):
+    add_tag(dirtyrepo, 'thetag', 'a763aa560953e7cfb87ccbc2f536d665aa4dff22')
+    assert 'thetag' == dirtyrepo.describe()
 
-    def setUp(self):
-        super(utils.DirtyRepoTestCase, self).setUp()
-        add_tag(self.repo, 'thetag', 'a763aa560953e7cfb87ccbc2f536d665aa4dff22')
-
-    def test_describe(self):
-        assert 'thetag' == self.repo.describe()
-
-    def test_describe_with_dirty_suffix(self):
-        assert 'thetag-dirty' == self.repo.describe(dirty_suffix='-dirty')
+def test_describe_with_dirty_suffix(dirtyrepo):
+    add_tag(dirtyrepo, 'thetag', 'a763aa560953e7cfb87ccbc2f536d665aa4dff22')
+    assert 'thetag-dirty' == dirtyrepo.describe(dirty_suffix='-dirty')