Adjusting env to run in Travis

Author: diemol

.travis.yml

@@ -1,4 +1,7 @@
----
+language: python
+python:
+  - 2.7
+
 sudo: required
 
 services:
@@ -12,7 +15,6 @@ notifications:
 before_install:
   - docker info
   - VERSION="$TRAVIS_BRANCH" make build
-  - docker build -t test:local ./Test
 
 script:
   - VERSION="$TRAVIS_BRANCH" make test

Makefile

@@ -239,31 +239,31 @@ test: test_chrome \
 
 
 test_chrome:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChrome
 
 test_chrome_debug:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChromeDebug
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeChromeDebug
 
 test_chrome_standalone:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChrome
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChrome
 
 test_chrome_standalone_debug:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChromeDebug
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneChromeDebug
 
 test_firefox:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefox
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefox
 
 test_firefox_debug:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefoxDebug
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodeFirefoxDebug
 
 test_firefox_standalone:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefox
 
 test_firefox_standalone_debug:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefoxDebug
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh StandaloneFirefoxDebug
 
 test_phantomjs:
-	VERSION=$(VERSION) MAJOR_MINOR_PATCH=$(MAJOR_MINOR_PATCH) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodePhantomJS
+	VERSION=$(VERSION) NAMESPACE=$(NAMESPACE) ./tests/bootstrap.sh NodePhantomJS
 
 
 .PHONY: \

tests/SmokeTests/__init__.py

@@ -7,7 +7,6 @@
 
 class SmokeTests(unittest.TestCase):
     def smoke_test_container(self, port):
-        build_version = os.environ.get('MAJOR_MINOR_PATCH')
         current_attempts = 0
         max_attempts = 3
         sleep_interval = 3
@@ -26,8 +25,6 @@ def smoke_test_container(self, port):
 
         self.assertTrue(status_fetched, "Container status was not fetched on port %s" % port)
         self.assertTrue(status_json['status'] == 0, "Wrong status value for container on port %s" % port)
-        self.assertTrue(status_json['value']['build']['version'] == build_version,
-                        "Wrong build version in container on port %s" % port)
         self.assertTrue(status_json['value']['ready'], "Container is not ready on port %s" % port)