From de8b125074bd5b03d3adb80b35ce36a00e7352d9 Mon Sep 17 00:00:00 2001 From: Simaris Date: Tue, 29 Dec 2020 10:07:49 +0100 Subject: [PATCH] registered merge tests in .travis.yml --- .travis.yml | 1 + tests/merges/test_merge_methods.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c59b7de..deeaf4f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ script: - coverage run -a --source=quit tests/test_helpers.py - coverage run -a --source=quit tests/test_namespace.py - coverage run -a --source=quit tests/test_provenance.py + - coverage run -a --source=quit tests/merges/test_merge_methods.py before_deploy: - mkdir dist diff --git a/tests/merges/test_merge_methods.py b/tests/merges/test_merge_methods.py index f57f02c8..531126d3 100644 --- a/tests/merges/test_merge_methods.py +++ b/tests/merges/test_merge_methods.py @@ -26,7 +26,7 @@ def testThreeWayMerge(self): testPath = os.path.dirname(os.path.abspath(__file__)) for d in listdir(testPath): if d[0:4] == "Test" and isdir(join(testPath, d)): - self._merge_test(d, "three-way") + self._merge_test(join(testPath, d), "three-way") def testContextMerge(self): """Test merging two commits. Method: Context""" @@ -34,7 +34,7 @@ def testContextMerge(self): exceptions = ["TestHouseMerge"] # TestHouse actually raises a merge conflict exception for d in listdir(testPath): if d[0:4] == "Test" and isdir(join(testPath, d)) and d not in exceptions: - self._merge_test(d, "context") + self._merge_test(join(testPath, d), "context") def _merge_test(self, dirPath, method): # Prepate a git Repository