From 1ac4dbb50861d502cb819c63335848a60ffa7dec Mon Sep 17 00:00:00 2001
From: TomSweeneyRedHat <tsweeney@redhat.com>
Date: Sat, 25 Aug 2018 12:59:44 -0400
Subject: Move whale-says test to end of baseline

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>

Closes: #1346
Approved by: rhatdan
---
 test/test_podman_baseline.sh | 65 +++++++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/test/test_podman_baseline.sh b/test/test_podman_baseline.sh
index 74a4398ca..234c417d5 100755
--- a/test/test_podman_baseline.sh
+++ b/test/test_podman_baseline.sh
@@ -5,11 +5,15 @@
 # on a freshly installed machine with no images or container in
 # play.  This currently needs to be run as root.
 #
+# Please leave the whale-says test as the last test in this script.
+# It makes it easier to identify if the script has finished or not.
+#
 # To run this command:
 #
 # /bin/bash -v test_podman_baseline.sh -d # Install and then deinstall Docker
 # /bin/bash -v test_podman_baseline.sh -e # Stop on error
 # /bin/bash -v test_podman_baseline.sh    # Continue on error
+#
 
 #######
 # See if we want to stop on errors and/or install and then remove Docker.
@@ -345,34 +349,6 @@ podman rm --all
 podman rmi --all
 rm ./Dockerfile*
 
-########
-# Build Dockerfile for WhaleSays test
-########
-FILE=./Dockerfile
-/bin/cat <<EOM >$FILE
-FROM docker/whalesay:latest
-RUN apt-get -y update && apt-get install -y fortunes
-CMD /usr/games/fortune -a | cowsay
-EOM
-chmod +x $FILE
-
-########
-# Build with the Dockerfile
-########
-podman build -f Dockerfile -t whale-says
-
-########
-# Run the container to see what the whale says
-########
-podman run whale-says
-
-########
-# Clean up Podman and /tmp
-########
-podman rm --all
-podman rmi --all
-rm ./Dockerfile*
-
 ########
 # Run AppArmor rootless tests
 ########
@@ -446,3 +422,36 @@ EOF
     sudo -u "#1000" podman rmi --all
     rm -f $aaFile
 fi
+
+########
+# Build Dockerfile for WhaleSays test
+########
+FILE=./Dockerfile
+/bin/cat <<EOM >$FILE
+FROM docker/whalesay:latest
+RUN apt-get -y update && apt-get install -y fortunes
+CMD /usr/games/fortune -a | cowsay
+EOM
+chmod +x $FILE
+
+########
+# Build with the Dockerfile
+########
+podman build -f Dockerfile -t whale-says
+
+########
+# Run the container to see what the whale says
+########
+podman run whale-says
+
+########
+# NOTE: Please leave the whale-says as the last test
+# in this script.
+########
+
+########
+# Clean up Podman and /tmp
+########
+podman rm --all
+podman rmi --all
+rm ./Dockerfile*
-- 
cgit v1.2.3-54-g00ecf