Tidy up travis files

2017-02-13 23:22:04 +00:00
parent a0a3069b1c
commit bee046b2ea
3 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ script:
  - docker ps
  - sleep 5
  - curl -I 127.0.0.1:80
-  - python tests.py
+  - python .travis/tests.py

 notifications:
  slack: ngineered:EIKJFrzibOe0TwUhLXNe8Q2Q
--- a/.travis/tests.py
+++ b/.travis/tests.py
@@ -5,7 +5,7 @@ import sys

 def run_functional_tests():
    ''' Execute Functional Tests '''
-    tests = unittest.TestLoader().discover('tests/functional')
+    tests = unittest.TestLoader().discover('.travis/tests/functional')
    result = unittest.TextTestRunner(verbosity=2).run(tests)
    return result.wasSuccessful()

--- a/.travis/tests/functional/test_content.py
+++ b/.travis/tests/functional/test_content.py