From 0e49acc5e0fe69908873fde2f6c2a620c5eabe40 Mon Sep 17 00:00:00 2001
From: Bruno Wolff III <bruno@wolff.to>
Date: May 22 2019 09:22:53 +0000
Subject: Get rid of remnents of indirect test run


---

diff --git a/tests/test_working.yml b/tests/test_working.yml
index b424ead..6d279b9 100644
--- a/tests/test_working.yml
+++ b/tests/test_working.yml
@@ -1,12 +1,25 @@
+---
 - hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - working:
-        dir: .
-        run: ansible-playbook --tags=classic wrapper_working.yml
-    required_packages:
-    - rpmdevtools
-    - ansible
+  tags:
+  - classic
+  remote_user: root
+  tasks:
+  - name: Install the test files
+    copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} mode=0755
+    with_items:
+    - {file: Squashfs-compression-test.sh, dest: Squashfs-compression-test.sh }
+  - name: Test block
+    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
+          echo -e "results:\n- {result: $result, test: working}" > /tmp/results.yml
+    always:
+      - name: Pull out the logs
+        fetch:
+          dest: "../../logs/"
+          src: "{{ item }}"
+          flat: yes
+        with_items:
+          - /tmp/test.log
+          - /tmp/results.yml
diff --git a/tests/tests.yml b/tests/tests.yml
index 5a81fec..a6c2ec1 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1 +1 @@
-- import_playbook: wrapper_working.yml
+- import_playbook: tests_working.yml
diff --git a/tests/wrapper_working.yml b/tests/wrapper_working.yml
deleted file mode 100644
index 6d279b9..0000000
--- a/tests/wrapper_working.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- hosts: localhost
-  tags:
-  - classic
-  remote_user: root
-  tasks:
-  - name: Install the test files
-    copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} mode=0755
-    with_items:
-    - {file: Squashfs-compression-test.sh, dest: Squashfs-compression-test.sh }
-  - name: Test block
-    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
-          echo -e "results:\n- {result: $result, test: working}" > /tmp/results.yml
-    always:
-      - name: Pull out the logs
-        fetch:
-          dest: "../../logs/"
-          src: "{{ item }}"
-          flat: yes
-        with_items:
-          - /tmp/test.log
-          - /tmp/results.yml