From 60cf0845eaa755ef532176368a0086a4f66d56e8 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: May 22 2019 09:47:43 +0000
Subject: Keep setup output out of test.log


It looks like the command that gets run covers more than the test script.
We need to keep that other output out of the output we search for
failure. The includes the dnf step, since it can have non fatal failures.
It also looks like the dnf step might need kernel-modules-extra for
mounting squashfs file systems.

---

diff --git a/tests/Squashfs-compression-test.sh b/tests/Squashfs-compression-test.sh
index 463710c..cfd1912 100755
--- a/tests/Squashfs-compression-test.sh
+++ b/tests/Squashfs-compression-test.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # We need rpmdev-vercmp
-dnf install -y --nogpgcheck rpmdevtools
 rpm -q rpmdevtools > /dev/null 2>&1 || (echo 'rpmdev-vercmp from rpmdevtools is needed to run this script, aborting (failed).'; exit 1)
 
 # Define block sizes
diff --git a/tests/test_working.yml b/tests/test_working.yml
index 6d279b9..c13d303 100644
--- a/tests/test_working.yml
+++ b/tests/test_working.yml
@@ -12,7 +12,7 @@
     block:
       - name: Execute the tests
         shell: |
-          /usr/local/bin/Squashfs-compression-test.sh &> /tmp/test.log; grep -iq failed /tmp/test.log && result=fail || result=pass
+          dnf install -y --nogpgcheck kernel-modules-extra rpmdevtools; (/usr/local/bin/Squashfs-compression-test.sh &> /tmp/test.log); grep -iq failed /tmp/test.log && result=fail || result=pass
           echo -e "results:\n- {result: $result, test: working}" > /tmp/results.yml
     always:
       - name: Pull out the logs