Fix Cirrus CI and make tests pep8-compliant (#101)

* Cirrus-CI: update to FreeBSD 15.0

* tests: replace pytest-pep8 by pycodestyle

* style: fix pep8 offenses

Author: Defenso-QTH

.cirrus.yml

@@ -1,5 +1,5 @@
 freebsd_instance:
-  image_family: freebsd-14-1
+  image_family: freebsd-15-0-amd64-zfs
 
 iocage_tests_task:
   create_pool_script:
@@ -12,7 +12,7 @@ iocage_tests_task:
     populate_script:
         - pkg fetch -udy git python3 py311-sqlite3 devel/py-libzfs
         - pkg fetch -Udy rust
-        - sed -E 's/([^<>=]+).*/py311-\1/' requirements.txt requirements-test.txt | xargs pkg fetch -Udy
+        - sed -E 's/([^<>=]+).*/py311-\1/' requirements.txt requirements-test.txt | xargs pkg fetch -Udiy
   install_pkgs_script:
     - pkg update
     - pkg install -Uy git python3 py311-sqlite3
@@ -35,7 +35,7 @@ iocage_tests_task:
         - pip
     - name: Use prebuilt packages
       install_python_packages_script:
-        - sed -E 's/([^<>=]+).*/py311-\1/' requirements.txt requirements-test.txt | xargs pkg install -Uy
+        - sed -E 's/([^<>=]+).*/py311-\1/' requirements.txt requirements-test.txt | xargs pkg install -Uyi
         # Necessary as long as py311-pytest and py311-pytest-pep8 conflict
         - python3 -m pip install -r requirements-test.txt
   env_setup_script:

pytest.ini

@@ -1,7 +1,5 @@
 [pytest]
-addopts = -vvv -rs --ignore=setup.py --pep8 --cov-report term-missing --cov=./iocage_lib --cov=./iocage_cli
-pep8maxlinelength = 80
-pep8ignore = * ALL
+addopts = -vvv -rs --ignore=setup.py --pycodestyle --cov-report term-missing --cov=./iocage_lib --cov=./iocage_cli
 markers =
     require_zpool
     require_root
@@ -10,4 +8,4 @@ markers =
     require_networking
     require_nat
     require_upgrade
-    require_image
+    require_image

requirements-test.txt

@@ -1,6 +1,6 @@
 pytest
 pytest-cov
-pytest-pep8
 pytest-mock
+pytest-pycodestyle
 mock
 flake8

setup.cfg

@@ -0,0 +1,2 @@
+[pycodestyle]
+max-line-length = 80

tests/conftest.py

@@ -37,7 +37,7 @@ def pytest_addoption(parser):
         help='Specify a zpool to use.'
     )
     parser.addoption(
-        '--release', action='store', default='14.1-RELEASE',
+        '--release', action='store', default='latest',
         help='Specify a RELEASE to use.'
     )
     parser.addoption(

tests/functional_tests/0004_start_test.py

@@ -57,6 +57,7 @@ def test_02_start_rc_jail(invoke_cli, resource_selector):
     for jail in resource_selector.rcjails:
         assert jail.running is True, f'{jail.name} not running'
 
+
 # Network-related tests belong here because the code is only executed at jail
 # start time.
 
@@ -97,11 +98,15 @@ def test_03_create_and_start_nobridge_vnet_jail(release, jail, invoke_cli):
         stdout, stderr = jail.run_command(['ifconfig'], jailed=False)
 
         assert bool(stderr) is False, f'Ifconfig returned an error: {stderr}'
-        assert re.search(r'bridge[0-9]', stdout) is None, 'Unexpected bridge was created.'
+        assert re.search(r'bridge[0-9]', stdout) is None, \
+            'Unexpected bridge was created.'
         assert f'fe80::1%vnet0.{jail.jid}' in stdout
-        assert f'description: associated with jail: {jail.name} as nic: epair0b'
+        assert (f'description: associated with jail: {jail.name} '
+                'as nic: epair0b') in stdout
 
-        stdout, stderr = jail.run_command(['ping', '-c', '1', f'fe80::2%vnet0.{jail.jid}'], jailed=False)
+        stdout, stderr = jail.run_command(
+            ['ping', '-c', '1', f'fe80::2%vnet0.{jail.jid}'],
+            jailed=False)
         assert bool(stderr) is False, f'Ping returned an error: {stderr}'
 
         invoke_cli([
@@ -136,4 +141,4 @@ def test_04_vnet_jail_with_loopback_alias(release, jail, invoke_cli):
 
     invoke_cli([
         'destroy', jail.name, '-f'
-    ])
+    ])

tests/functional_tests/0005_stop_test.py

@@ -97,7 +97,7 @@ def test_03_test_force_flag_stopping_jail(
         )
 
         assert jail.running is False
-        assert not os.path.exists(test_file),\
+        assert not os.path.exists(test_file), \
             f'Pre-stop services being executed'
 
     finally:

tests/functional_tests/0015_rename_test.py

@@ -51,7 +51,8 @@ def test_01_rename_jail(invoke_cli, resource_selector, skip_test, jail):
 
 @require_root
 @require_zpool
-def test_02_rename_template_jail(invoke_cli, resource_selector, skip_test, jail):
+def test_02_rename_template_jail(invoke_cli, resource_selector, skip_test,
+                                 jail):
     jails = resource_selector.template_jails
     skip_test(not jails)
 

tests/functional_tests/0016_restart_test.py

@@ -126,7 +126,8 @@ def test_01_restart_jail(invoke_cli, resource_selector, skip_test, write_file):
 
 @require_root
 @require_zpool
-def test_02_soft_restart_jail(invoke_cli, resource_selector, skip_test, write_file):
+def test_02_soft_restart_jail(invoke_cli, resource_selector, skip_test,
+                              write_file):
     common_restart_jail(
         invoke_cli, resource_selector, skip_test,
         ['restart', '-s'], write_file
@@ -136,14 +137,13 @@ def test_02_soft_restart_jail(invoke_cli, resource_selector, skip_test, write_fi
 @require_root
 @require_zpool
 def test_03_restart_all_jails(invoke_cli, resource_selector, skip_test):
-    common_restart_all_jails(invoke_cli, resource_selector, skip_test, ['restart'])
-
-
+    common_restart_all_jails(invoke_cli, resource_selector, skip_test,
+                             ['restart'])
 
 
 @require_root
 @require_zpool
 def test_04_soft_restart_all_jails(invoke_cli, resource_selector, skip_test):
     common_restart_all_jails(
         invoke_cli, resource_selector, skip_test, ['restart', '-s']
-    )
+    )

tests/functional_tests/0020_remove_snapshot_test.py

@@ -66,7 +66,7 @@ def test_01_remove_snapshot(invoke_cli, resource_selector, skip_test):
 @require_root
 @require_zpool
 def test_02_remove_snapshot_of_all_jails(
-    invoke_cli, resource_selector, skip_test):
+        invoke_cli, resource_selector, skip_test):
     jails = resource_selector.all_jails
     skip_test(not jails)
 
@@ -93,6 +93,7 @@ def test_02_remove_snapshot_of_all_jails(
 
     assert all(snap.exists is False for snap in remove_snaps)
 
+
 @require_root
 @require_zpool
 def test_03_remove_all_snapshots_fail(invoke_cli, resource_selector, skip_test):
@@ -102,7 +103,7 @@ def test_03_remove_all_snapshots_fail(invoke_cli, resource_selector, skip_test):
     snap_jail = None
     for jail in jails:
         if (not jail.is_template and not jail.is_cloned and
-            len(jail.recursive_snapshots)>0):
+                len(jail.recursive_snapshots) > 0):
             snap_jail = jail
             break
 
@@ -124,14 +125,14 @@ def test_03_remove_all_snapshots_fail(invoke_cli, resource_selector, skip_test):
 @require_root
 @require_zpool
 def test_04_remove_all_snapshots_success(invoke_cli, resource_selector,
-                                        snapshot, skip_test):
+                                         snapshot, skip_test):
     jails = resource_selector.all_jails_having_snapshots
     skip_test(not jails)
 
     snap_jail = None
     for jail in jails:
         if (not jail.is_template and not jail.is_cloned and
-            len(jail.recursive_snapshots)>1):
+                len(jail.recursive_snapshots) > 1):
             snap_jail = jail
             break
 
@@ -160,7 +161,7 @@ def test_04_remove_all_snapshots_success(invoke_cli, resource_selector,
 @require_root
 @require_zpool
 def test_05_remove_all_snapshots_all_jails(invoke_cli, resource_selector,
-                                        snapshot, skip_test):
+                                           snapshot, skip_test):
     jails = resource_selector.all_jails_having_snapshots
     skip_test(not jails)