Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdam Warner <me@adamwarner.co.uk>2022-07-19 20:33:36 +0300
committerAdam Warner <me@adamwarner.co.uk>2022-07-30 18:27:29 +0300
commite29aa4e2058e9f4d76289b75cebdb6ab781e693d (patch)
treec988ea4924d2926a8cb489fef1865c2c8397e159 /test
parenta45c9f9f5032b92c512b5f00229e73cbbd0aea81 (diff)
First things first...
Diffstat (limited to 'test')
-rw-r--r--test/_centos_7.Dockerfile19
-rw-r--r--test/centos7.epel.override7
-rw-r--r--test/test_centos_7_support.py63
-rw-r--r--test/tox.centos_7.ini8
4 files changed, 0 insertions, 97 deletions
diff --git a/test/_centos_7.Dockerfile b/test/_centos_7.Dockerfile
deleted file mode 100644
index b97f1679..00000000
--- a/test/_centos_7.Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM centos:7
-RUN yum install -y dialog git python3
-
-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
-
-ADD test/centos7.epel.override /etc/yum/pluginconf.d/fastestmirror.conf
-RUN true && \
- chmod +x $SCRIPTDIR/*
-
-ENV SKIP_INSTALL true
-ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
-
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
diff --git a/test/centos7.epel.override b/test/centos7.epel.override
deleted file mode 100644
index 3451f17d..00000000
--- a/test/centos7.epel.override
+++ /dev/null
@@ -1,7 +0,0 @@
-[main]
-verbose = 0
-socket_timeout = 3
-enabled = 1
-hostfilepath = /var/cache/yum/timedhosts.txt
-maxhostfileage = 1
-exclude=.edu
diff --git a/test/test_centos_7_support.py b/test/test_centos_7_support.py
deleted file mode 100644
index c7e75813..00000000
--- a/test/test_centos_7_support.py
+++ /dev/null
@@ -1,63 +0,0 @@
-from .conftest import (
- tick_box,
- info_box,
- mock_command,
-)
-
-
-def test_php_upgrade_default_optout_centos_eq_7(host):
- '''
- confirms the default behavior to opt-out of installing PHP7 from REMI
- '''
- package_manager_detect = host.run('''
- source /opt/pihole/basic-install.sh
- package_manager_detect
- select_rpm_php
- ''')
- expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
- 'Deprecated PHP may be in use.')
- assert expected_stdout in package_manager_detect.stdout
- remi_package = host.package('remi-release')
- assert not remi_package.is_installed
-
-
-def test_php_upgrade_user_optout_centos_eq_7(host):
- '''
- confirms installer behavior when user opt-out of installing PHP7 from REMI
- (php not currently installed)
- '''
- # dialog returns Cancel for user prompt
- mock_command('dialog', {'*': ('', '1')}, host)
- package_manager_detect = host.run('''
- source /opt/pihole/basic-install.sh
- package_manager_detect
- select_rpm_php
- ''')
- expected_stdout = info_box + (' User opt-out of PHP 7 upgrade on CentOS. '
- 'Deprecated PHP may be in use.')
- assert expected_stdout in package_manager_detect.stdout
- remi_package = host.package('remi-release')
- assert not remi_package.is_installed
-
-
-def test_php_upgrade_user_optin_centos_eq_7(host):
- '''
- confirms installer behavior when user opt-in to installing PHP7 from REMI
- (php not currently installed)
- '''
- # dialog returns Continue for user prompt
- mock_command('dialog', {'*': ('', '0')}, host)
- package_manager_detect = host.run('''
- source /opt/pihole/basic-install.sh
- package_manager_detect
- select_rpm_php
- ''')
- assert 'opt-out' not in package_manager_detect.stdout
- expected_stdout = info_box + (' Enabling Remi\'s RPM repository '
- '(https://rpms.remirepo.net)')
- assert expected_stdout in package_manager_detect.stdout
- expected_stdout = tick_box + (' Remi\'s RPM repository has '
- 'been enabled for PHP7')
- assert expected_stdout in package_manager_detect.stdout
- remi_package = host.package('remi-release')
- assert remi_package.is_installed
diff --git a/test/tox.centos_7.ini b/test/tox.centos_7.ini
deleted file mode 100644
index 319465dd..00000000
--- a/test/tox.centos_7.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-envlist = py38
-
-[testenv]
-whitelist_externals = docker
-deps = -rrequirements.txt
-commands = docker build -f _centos_7.Dockerfile -t pytest_pihole:test_container ../
- pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py ./test_centos_common_support.py ./test_centos_7_support.py