Updated integration tests

Author: cftorres

.container-diff-tests.sh

@@ -7,11 +7,19 @@ while IFS=$' \n\r' read -r flag differ image1 image2 file; do
   fi
 done < tests/differ_runs.txt
 
+while IFS=$' \n\r' read -r flag analyzer image file; do
+  go run main.go $image $flag -j > $file
+  if [[ $? -ne 0 ]]; then
+    echo "container-diff" "$analyzer" "analyzer failed"
+    exit 1
+  fi
+done < tests/analyzer_runs.txt
+
 success=0
-while IFS=$' \n\r' read -r differ actual expected; do
+while IFS=$' \n\r' read -r type analyzer actual expected; do
   diff=$(jq --argfile a "$actual" --argfile b "$expected" -n 'def walk(f): . as $in | if type == "object" then reduce keys[] as $key ( {}; . + { ($key):  ($in[$key] | walk(f)) } ) | f elif type == "array" then map( walk(f) ) | f else f end; ($a | walk(if type == "array" then sort else . end)) as $a | ($b | walk(if type == "array" then sort else . end)) as $b | $a == $b')
   if ! "$diff" ; then
-    echo "container-diff" "$differ" "diff output is not as expected"
+    echo "container-diff" "$analyzer" "$type" "output is not as expected"
     success=1
   fi
 done < tests/diff_comparisons.txt

cmd/root.go

@@ -216,7 +216,7 @@ func analyzeImage(imageArg string, analyzerArgs []string) error {
 }
 
 func cleanupImage(image utils.Image) {
-	if reflect.DeepEqual(image, (utils.Image{})) {
+	if !reflect.DeepEqual(image, (utils.Image{})) {
 		glog.Infof("Removing image filesystem directory %s from system", image.FSPath)
 		errMsg := remove(image.FSPath, true)
 		if errMsg != "" {

tests/analyzer_runs.txt

@@ -0,0 +1,3 @@
+-p pip gcr.io/gcp-runtimes/pip-modified tests/pip_analysis_actual.json
+-a apt gcr.io/gcp-runtimes/apt-modified tests/apt_analysis_actual.json
+-n node gcr.io/gcp-runtimes/node-modified tests/node_analysis_actual.json