Drop autouse, it's redundant, zap a few print() calls

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/regression-tests.recursor-dnssec/conftest.py b/regression-tests.recursor-dnssec/conftest.py
index acccb690c5dd46eddc905c69360b636c0145f373..3834ba6d4c6680a61f1f5a2a9239892329edf20f 100644 (file)
--- a/regression-tests.recursor-dnssec/conftest.py
+++ b/regression-tests.recursor-dnssec/conftest.py
@@ -3,12 +3,12 @@ import shutil
 from recursortests import RecursorTest
 import pytest
 
-@pytest.fixture(scope='session', autouse=True)
+@pytest.fixture(scope='session')
 def run_auths() -> str:
     confdir = 'configs/auths'
     shutil.rmtree(confdir, True)
     os.mkdir(confdir)
-    print('Starting auths from fixture..')
+    print('\nStarting auths from fixture...')
     RecursorTest.generateAllAuthConfig(confdir)
     RecursorTest.startAllAuth(confdir)
     yield "Here's Johnny!"

diff --git a/regression-tests.recursor-dnssec/recursortests.py b/regression-tests.recursor-dnssec/recursortests.py
index fbd78c086f554e2bcc6ec80390787dbc2f77b55e..2859bf9ea5d1711e174d66e589f738242dc3e323 100644 (file)
--- a/regression-tests.recursor-dnssec/recursortests.py
+++ b/regression-tests.recursor-dnssec/recursortests.py
@@ -490,7 +490,6 @@ options {
     @classmethod
     def generateAuthConfig(cls, confdir, threads, extra=''):
         bind_dnssec_db = os.path.join(confdir, 'bind-dnssec.sqlite3')
-        print('writing to ' + os.path.join(confdir, 'pdns.conf'))
         with open(os.path.join(confdir, 'pdns.conf'), 'w') as pdnsconf:
             pdnsconf.write("""
 module-dir={moduledir}
@@ -519,7 +518,6 @@ distributor-threads={threads}
                        'create-bind-db',
                        bind_dnssec_db]
 
-        print(' '.join(pdnsutilCmd))
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
@@ -554,16 +552,13 @@ distributor-threads={threads}
 
     @classmethod
     def generateAllAuthConfig(cls, confdir):
-        print("generateAllAuthConfig")
         if cls._auth_zones:
             for auth_suffix, zoneinfo in cls._auth_zones.items():
-                print(auth_suffix)
                 threads = zoneinfo['threads']
                 zones = zoneinfo['zones']
                 authconfdir = os.path.join(confdir, 'auth-%s' % auth_suffix)
 
                 os.mkdir(authconfdir)
-                print(authconfdir)
                 cls.generateAuthConfig(authconfdir, threads)
                 cls.generateAuthNamedConf(authconfdir, zones)