🚒 made sure the test for issue 55 is agnostic to git version

Added the ability to mock git up in test_main methods,
and setup of the repository in both mock and temp dir.

Signed-off-by: Guyzmo <[email protected]>

Author: guyzmo

.travis.yml

@@ -1,4 +1,6 @@
 language: python
+# Don't use the Travis Container-Based Infrastructure
+sudo: true
 matrix:
   include:
     - os: linux

tests/helpers.py

@@ -15,6 +15,34 @@
 
 from git_repo.repo import RepositoryService, main
 
+
+class TestGitPopenMockupMixin:
+    def setup_git_popen(self):
+        # repository mockup (in a temporary place)
+        self.repository = Repo.init(self.tempdir.name)
+        # setup git command mockup
+        self.Popen = MockPopen()
+        self.Popen.mock.Popen_instance.stdin = None
+        self.Popen.mock.Popen_instance.wait = lambda *a, **k: self.Popen.wait()
+        self.Popen.mock.Popen_instance.__enter__ = lambda self: self
+        self.Popen.mock.Popen_instance.__exit__ = lambda self, *a, **k: None
+
+    def set_mock_popen_commands(self, cmd_list):
+        for cmd, out, err, rc in cmd_list:
+            self.Popen.set_command(cmd, out, err, returncode=rc)
+
+    def mockup_git(self, namespace, repository, url=None):
+        # disable refspec check
+        from git import remote
+        remote.Remote._assert_refspec = lambda self: None
+        # write FETCH_HEAD ref
+        with open(os.path.join(self.repository.git_dir, 'FETCH_HEAD'), 'w') as f:
+            url = url or "{}:{}/{}".format(self.service.fqdn, namespace, repository)
+            f.write("749656b8b3b282d11a4221bb84e48291ca23ecc6" \
+                    "		branch 'master' of {}".format(url))
+        return Replace('git.cmd.Popen', self.Popen)
+
+
 class RepositoryMockup(RepositoryService):
     name = 'test_name'
     command = 'test_command'
@@ -134,7 +162,8 @@ def user(self):
     def get_repository(self, *args, **kwarg):
         return {}
 
-class GitRepoMainTestCase():
+
+class GitRepoMainTestCase(TestGitPopenMockupMixin):
     def setup_method(self, method):
         self.log.info('GitRepoMainTestCase.setup_method({})'.format(method))
         self.tempdir = TemporaryDirectory()
@@ -148,6 +177,8 @@ def setup_method(self, method):
             'lab': 'gitlab',
             'bb': 'bitbucket',
         }
+        # setup git command mockup
+        self.setup_git_popen()
 
     def teardown_method(self, method):
         self.log.info('GitRepoMainTestCase.teardown_method({})'.format(method))
@@ -341,25 +372,21 @@ def main_noop(self, repo, rc=1, args={}):
             '--path': self.tempdir.name
         }, args)), "Non {} result for no-action".format(rc)
 
-class GitRepoTestCase():
+
+class GitRepoTestCase(TestGitPopenMockupMixin):
     def setup_method(self, method):
         self.log.info('GitRepoTestCase.setup_method({})'.format(method))
         # build temporary directory
         self.tempdir = TemporaryDirectory()
-        # repository mockup (in a temporary place)
-        self.repository = Repo.init(self.tempdir.name)
-        # setup git command mockup
-        self.Popen = MockPopen()
-        self.Popen.mock.Popen_instance.stdin = None
-        self.Popen.mock.Popen_instance.wait = lambda *a, **k: self.Popen.wait()
-        self.Popen.mock.Popen_instance.__enter__ = lambda self: self
-        self.Popen.mock.Popen_instance.__exit__ = lambda self, *a, **k: None
         # when initiating service with no repository, the connection is not triggered
         self.service = self.get_service()
-        self.service.repository = self.repository
         # setup http api mockup
         self.recorder = betamax.Betamax(self.get_requests_session())
         self.get_requests_session().headers['Accept-Encoding'] = 'identity'
+        # setup git command mockup
+        self.setup_git_popen()
+        # when initiating service with no repository, the connection is not triggered
+        self.service.repository = self.repository
         # have git commands logged
         Git.GIT_PYTHON_TRACE = True
         FORMAT = '> %(message)s'
@@ -390,22 +417,6 @@ def _make_cassette_name(self):
             return '_'.join(['test', self.service.name, test_function_name])
         raise Exception("Helpers functions shall be used only within test functions!")
 
-    '''popen helper'''
-
-    def set_mock_popen_commands(self, cmd_list):
-        for cmd, out, err, rc in cmd_list:
-            self.Popen.set_command(cmd, out, err, returncode=rc)
-
-    def mockup_git(self, namespace, repository):
-        # disable refspec check
-        from git import remote
-        remote.Remote._assert_refspec = lambda self: None
-        # write FETCH_HEAD ref
-        with open(os.path.join(self.repository.git_dir, 'FETCH_HEAD'), 'w') as f:
-            f.write("749656b8b3b282d11a4221bb84e48291ca23ecc6" \
-                    "		branch 'master' of git@{}/{}/{}".format(self.service.fqdn, namespace, repository))
-        return Replace('git.cmd.Popen', self.Popen)
-
     '''assertion helpers'''
 
     def assert_repository_exists(self, namespace, repository):

tests/integration/test_main.py

@@ -333,17 +333,25 @@ def test_request_list__no_repo_slug__https_dot_git_fix__issue55(self):
         from subprocess import call
         call(['git', 'init', '-q', self.tempdir.name])
         call(['git', '--git-dir={}/.git'.format(self.tempdir.name), 'remote', 'add', 'github', 'https://github.com/guyzmo/.git-repo'])
-        repo_slug, seen_args = self.main_request_list(rc=0, args={})
-        assert ('guyzmo', '.git-repo') == repo_slug
-        assert dict() == seen_args
+        with self.mockup_git('guyzmo', '.git-repo', 'https://github.com/guyzmo/.git-repo'):
+            self.set_mock_popen_commands([
+                ('git remote get-url --all github', b'https://github.com/guyzmo/.git-repo\n', b'', 0),
+            ])
+            repo_slug, seen_args = self.main_request_list(rc=0, args={})
+            assert ('guyzmo', '.git-repo') == repo_slug
+            assert dict() == seen_args
 
     def test_request_list__no_repo_slug__git_dot_git_fix__issue55(self):
         from subprocess import call
         call(['git', 'init', '-q', self.tempdir.name])
         call(['git', '--git-dir={}/.git'.format(self.tempdir.name), 'remote', 'add', 'github', '[email protected]:guyzmo/.git-repo'])
-        repo_slug, seen_args = self.main_request_list(rc=0, args={})
-        assert ('guyzmo', '.git-repo') == repo_slug
-        assert dict() == seen_args
+        with self.mockup_git('guyzmo', '.git-repo', '[email protected]:guyzmo/.git-repo'):
+            self.set_mock_popen_commands([
+                ('git remote get-url --all github', b'[email protected]:guyzmo/.git-repo', b'', 0),
+            ])
+            repo_slug, seen_args = self.main_request_list(rc=0, args={})
+            assert ('guyzmo', '.git-repo') == repo_slug
+            assert dict() == seen_args
 
     def test_request_fetch__request(self, capsys, caplog):
         from subprocess import call