Merge pull request #23 from butomo1989/master

Fixed path issue

docker-compose.yaml

@@ -7,7 +7,7 @@ services:
       - 8089:8089
     volumes:
       - ~/.aws:/root/.aws
-      - ./:/opt
+      - ./:/opt/script
     environment:
       - ROLE=master
       - TARGET_HOST=$TARGET_HOST
@@ -19,7 +19,7 @@ services:
     network_mode: "service:master"
     volumes:
       - ~/.aws:/root/.aws
-      - ./:/opt
+      - ./:/opt/script
     environment:
       - ROLE=slave
       - MASTER_HOST=master

local.sh

@@ -36,7 +36,7 @@ ________________________________________________________________________________
 _________________________________________________________________________________
 EOF
 
-    IMAGE="registry.opensource.zalan.do/tip/docker-locust:0.7.3-p3"
+    IMAGE="registry.opensource.zalan.do/tip/docker-locust:0.7.3-p4"
     echo "Used image: $IMAGE"
 
     echo "----------------------------------------------"       

src/app.py

@@ -149,7 +149,7 @@ def get_locust_file():
             logger.error('File cannot be downloaded! Please check given url!')
     else:
         logger.info('Load test script from local machine')
-        file_name = given_input
+        file_name = '/'.join(['script', given_input])
 
     if not file_name:
         logger.error('File is empty')

src/tests/test_get_locust_file.py

@@ -51,5 +51,6 @@ def test_no_python_file(self, wget):
 
     def test_local_file(self):
         LOCAL_FILE = 'folder/file.py'
+        CONTAINER_FILE = 'script/' + 'folder/file.py'
         os.environ[self.url_key] = LOCAL_FILE
-        self.assertEquals(LOCAL_FILE, app.get_locust_file())
+        self.assertEquals(CONTAINER_FILE, app.get_locust_file())