registered merge tests in .travis.yml

Author: Simaris

.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

tests/merges/test_merge_methods.py

@@ -26,15 +26,15 @@ 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"""
         testPath = os.path.dirname(os.path.abspath(__file__))
         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