pr and non-pr tests

Signed-off-by: Ethan Hansen <1ethanhansen@gmail.com>

last one just ran npr

Signed-off-by: Ethan Hansen <1ethanhansen@gmail.com>

test to ensure .log created

Signed-off-by: Ethan Hansen <1ethanhansen@gmail.com>

PR check bypasses curl

Signed-off-by: Ethan Hansen <1ethanhansen@gmail.com>

Travis not working

Signed-off-by: Ethan Hansen <1ethanhansen@gmail.com>

Semicolons? In my python project?

Signed-off-by: Ethan Hansen <1ethanhansen@gmail.com>

remove and re-add a space

Author: Ethan Hansen

.travis.yml

@@ -6,10 +6,15 @@ install:
   - pip install -e .
   - pip install -r requirements.txt
 script:
-  #Download user.yaml file from a super secret URL that we enter as a Travis Environment variable
-  - curl $USER_YAML_URL > user.yaml
   #Runs tests of specific functions nicely (see tests/*.py)
   - pytest
-  #A bash script handles the rest so this file doesn't get too messy
-  - chmod +x tests/bash_tests.sh
-  - ./tests/bash_tests.sh
+  #Two bash scripts handle the rest so this file doesn't get too messy
+  - chmod +x tests/nPR_tests.sh
+  - chmod +x tests/pr_okay_tests.sh
+  - if [ $TRAVIS_PULL_REQUEST != false ]; then 
+        ./tests/pr_okay_tests.sh;
+    else
+        curl $USER_YAML_URL > user.yaml;
+        ./tests/nPR_tests.sh;
+        ./tests/pr_okay_tests.sh;
+    fi

tests/bash_tests.sh renamed to tests/nPR_tests.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 #test different args to get-image-info
-python get-image-info.py --help
 python get-image-info.py user.yaml
 python get-image-info.py user.yaml --debug
 
@@ -13,3 +12,7 @@ if [ $(head -1 results.csv | sed 's/[^,]//g' | wc -c) != 11 ]; then
 echo "Wrong number of columns in results";
 exit 1;	#travis build should fail if it get the wrong number of columns
 fi
+
+#tests if container-output.log exists
+if [ ! -f container-output.log ]; then exit 1; fi
+

tests/pr_okay_tests.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+#All the tests in this file can be run w/o user.yaml
+#and without secure Travis environment variables
+
+#Run python get-image-info with different arguments
+python get-image-info.py --help
+