Fix travis tests

barseghyanartur · Nov 27, 2019 · ea8e47b · ea8e47b
1 parent 818a831
commit ea8e47b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/matyan/tests/mixins.py b/src/matyan/tests/mixins.py
@@ -2,6 +2,7 @@
 import git
 
 from ..helpers import project_dir
+from ..utils import get_repository
 
 __author__ = 'Artur Barseghyan'
 __copyright__ = '2019 Artur Barseghyan'
@@ -26,6 +27,10 @@ def prepare_changelog_data(cls):
                 cls.test_dir,
                 StrictHostKeyChecking=False
             )
+            cls.repo = get_repository(cls.test_dir)
+        else:
+            cls.repo = get_repository(cls.test_dir)
+            cls.repo.pull()
 
         # Go to cloned repository
         os.chdir(cls.test_dir)

diff --git a/src/matyan/tests/test_core.py b/src/matyan/tests/test_core.py
@@ -38,11 +38,11 @@ class TestCore(unittest.TestCase, ChangelogMixin):
     def setUpClass(cls) -> None:
         super(TestCore, cls).setUpClass()
         cls.prepare_changelog_data()
-        cls.repo = get_repository(cls.test_dir)
 
     def tearDown(self):
         super(TestCore, self).tearDown()
         self.repo.checkout('master')
+        self.repo.pull()
 
     @log_info
     def test_generate_changelog(self):

diff --git a/src/matyan/utils.py b/src/matyan/utils.py
@@ -40,6 +40,7 @@
     'generate_changelog_cli',
     'get_branch_type',
     'get_logs',
+    'get_repository',
     'json_changelog',
     'json_changelog_cli',
     'make_config_file',