From 005c75ebf68282e10aa0676704cc3a424b56a985 Mon Sep 17 00:00:00 2001
From: Adam Warner <me@adamwarner.co.uk>
Date: Tue, 4 May 2021 18:37:45 +0100
Subject: [PATCH] 31 out, 33 in.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
---
 test/_fedora_31.Dockerfile                       | 16 ----------------
 test/tox.fedora_33.ini                           |  2 +-
 ...{tox.fedora_31.ini => tox.fedora_33.ini~HEAD} |  4 ++--
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 test/_fedora_31.Dockerfile
 rename test/{tox.fedora_31.ini => tox.fedora_33.ini~HEAD} (56%)

diff --git a/test/_fedora_31.Dockerfile b/test/_fedora_31.Dockerfile
deleted file mode 100644
index 02dcb733..00000000
--- a/test/_fedora_31.Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM fedora:31
-
-ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
-
-RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
-ADD . $GITDIR
-RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
-
-RUN true && \
-    chmod +x $SCRIPTDIR/*
-
-ENV PH_TEST true
-
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
diff --git a/test/tox.fedora_33.ini b/test/tox.fedora_33.ini
index 00ea732a..2119de81 100644
--- a/test/tox.fedora_33.ini
+++ b/test/tox.fedora_33.ini
@@ -5,4 +5,4 @@ envlist = py37
 whitelist_externals = docker
 deps = -rrequirements.txt
 commands = docker build -f _fedora_33.Dockerfile -t pytest_pihole:test_container ../
-           pytest {posargs:-vv -n auto} ./test_automated_install.py ./test_centos_fedora_common_support.py ./test_fedora_support.py
+           pytest {posargs:-vv -n auto} ./test_automated_install.py ./test_centos_fedora_common_support.py
diff --git a/test/tox.fedora_31.ini b/test/tox.fedora_33.ini~HEAD
similarity index 56%
rename from test/tox.fedora_31.ini
rename to test/tox.fedora_33.ini~HEAD
index d9dc9c15..00ea732a 100644
--- a/test/tox.fedora_31.ini
+++ b/test/tox.fedora_33.ini~HEAD
@@ -4,5 +4,5 @@ envlist = py37
 [testenv]
 whitelist_externals = docker
 deps = -rrequirements.txt
-commands = docker build -f _fedora_31.Dockerfile -t pytest_pihole:test_container ../
-           pytest {posargs:-vv -n auto} ./test_automated_install.py ./test_centos_fedora_common_support.py
+commands = docker build -f _fedora_33.Dockerfile -t pytest_pihole:test_container ../
+           pytest {posargs:-vv -n auto} ./test_automated_install.py ./test_centos_fedora_common_support.py ./test_fedora_support.py