Merge pull request #9 from microservices-demo/adding-container-test-to-travis

Enabling container travis build

Author: Aleksandr

.travis.yml

@@ -12,9 +12,10 @@ env:
 script:
   - set -e
   - ./scripts/build.sh;
-  - ./test/test.sh unit.py
+  - travis_wait ./test/test.sh unit.py
   - ./test/test.sh component.py
-#  - ./test/test.sh container.py --tag $TAG
+  - docker build -t weaveworksdemos/json-server ./test/json-server/
+  - ./test/test.sh container.py --tag $TAG
 
 after_success:
   - set -e;

test/container.py

@@ -64,7 +64,7 @@ def setUp(self):
                    '--link',
                    self.shipping_mock.container_name,
                    'weaveworksdemos/orders:' + self.COMMIT]
-        Docker().execute(command)
+        Docker().execute(command, dump_streams=True)
         self.ip = Docker().get_container_ip(OrdersContainerTest.container_name)
 
     def tearDown(self):
@@ -75,13 +75,13 @@ def tearDown(self):
         self.shipping_mock.cleanup()
 
     def test_api_validated(self):
-        limit = 20
+        limit = 30
         while Api().noResponse('http://' + self.ip + ':80/orders'):
             if limit == 0:
                 self.fail("Couldn't get the API running")
             limit = limit - 1
             sleep(1)
-        sleep(15)
+            
         out = Dredd().test_against_endpoint(
             "orders", 'http://' + self.ip + ':80/',
             links=[self.mongo_container_name, self.container_name],

test/unit.py

@@ -11,7 +11,7 @@ def test_maven(self):
         code_dir = script_dir + "/.."
         home = expanduser("~")
         command = ['docker', 'run', '--rm', '-v', home + '/.m2:/root/.m2', '-v', code_dir + ':/usr/src/mymaven', '-w',
-                   '/usr/src/mymaven', 'maven:3.2-jdk-8', 'mvn', 'test']
+                   '/usr/src/mymaven', 'maven:3.2-jdk-8', 'mvn', '-q', 'test']
         print(Docker().execute(command))