Resolved #48, obtaining test video moved from install to test setup

test/services/nginx/install.sh

@@ -32,18 +32,4 @@ yes Y | apt-get install nginx
 # http://nginx.org/en/docs/http/ngx_http_stub_status_module.html
 cp -rf $REPO_ROOT/test/services/nginx/nginx.conf /etc/nginx/nginx.conf
 nginx -s reload
-systemctl start nginx
-
-# Copy in the test video, this needs to be part of a test set up and not here.
-
-TEST_VIDEO="20180212104221flame-project-full.mp4"
-TEST_VIDEO_ARCHIVE=$TEST_VIDEO".gz"
-DEST_DIR="/usr/share/nginx/html" 
-DEST_FILE=$DEST_DIR"/"$TEST_VIDEO_ARCHIVE
-
-# Copy files for MPEG-DASH testing
-curl "ftp://ftp.it-innovation.soton.ac.uk/testdata/video/"$TEST_VIDEO_ARCHIVE --user flame-rw:DR8ngj3ogSjd8gl -o $DEST_FILE
-tar -xvf $DEST_FILE -C $DEST_DIR
-
-rm -rf $DEST_FILE
-mv $DEST_DIR"/"$TEST_VIDEO $DEST_DIR"/"test_video
\ No newline at end of file
+systemctl start nginx
\ No newline at end of file

test/streaming/setup.sh

@@ -47,4 +47,18 @@ curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chrono
 curl -i -X POST -H "Content-Type: application/json" http://localhost:9092/kapacitor/v1/tasks -d @$TEST_DIR/rules.json
 
 # Set up dashboard
-curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/dashboards -d @$TEST_DIR/dashboard.json
\ No newline at end of file
+curl -i -X POST -H "Content-Type: application/json" http://localhost:8888/chronograf/v1/dashboards -d @$TEST_DIR/dashboard.json
+
+# Copy in the test video
+
+TEST_VIDEO="20180212104221flame-project-full.mp4"
+TEST_VIDEO_ARCHIVE=$TEST_VIDEO".gz"
+DEST_DIR="/usr/share/nginx/html" 
+DEST_FILE=$DEST_DIR"/"$TEST_VIDEO_ARCHIVE
+
+# Copy files for MPEG-DASH testing
+curl "ftp://ftp.it-innovation.soton.ac.uk/testdata/video/"$TEST_VIDEO_ARCHIVE --user flame-rw:DR8ngj3ogSjd8gl -o $DEST_FILE
+tar -xvf $DEST_FILE -C $DEST_DIR
+
+rm -rf $DEST_FILE
+mv $DEST_DIR"/"$TEST_VIDEO $DEST_DIR"/"test_video
\ No newline at end of file