Fix Python test failures

Author: edewata

.github/workflows/qe-tests.yml .github/workflows/disabled/qe-tests.yml.github/workflows/qe-tests.yml renamed to .github/workflows/disabled/qe-tests.yml

@@ -100,8 +100,11 @@ def execute(self, argv):
                          subsystem_name.upper(), instance_name)
             sys.exit(1)
 
-        print('  Request ID generator: %s' % subsystem.config.get('dbs.request.id.generator', 'legacy'))
-        print('  Cert ID generator: %s' % subsystem.config.get('dbs.cert.id.generator', 'legacy'))
+        request_id_generator = subsystem.config.get('dbs.request.id.generator', 'legacy')
+        print('  Request ID generator: %s' % request_id_generator)
+
+        cert_id_generator = subsystem.config.get('dbs.cert.id.generator', 'legacy')
+        print('  Cert ID generator: %s' % cert_id_generator)
 
 
 class IdGeneratorUpdateCLI(pki.cli.CLI):

base/server/python/pki/server/cli/id.py

@@ -242,10 +242,15 @@ def spawn(self, deployer):
                 subsystem.config['dbs.endSerialNumber'] = serial_number_range_end
 
             if cert_id_generator == 'legacy2':
+
                 if not serial_number_range_start.startswith('0x'):
-                    raise Exception('pki_serial_number_range_start format not valid, expecting 0x...')
+                    raise Exception(
+                        'Invalid pki_serial_number_range_start: %s' % serial_number_range_start)
+
                 if not serial_number_range_end.startswith('0x'):
-                    raise Exception('pki_serial_number_range_end format not valid, expecting 0x...')
+                    raise Exception(
+                        'Invalid pki_serial_number_range_end: %s' % serial_number_range_end)
+
                 subsystem.config['dbs.serialIncrement'] = '0x10000000'
                 subsystem.config['dbs.serialLowWaterMark'] = '0x2000000'
                 subsystem.config['dbs.serialCloneTransferNumber'] = '0x10000'
@@ -272,7 +277,6 @@ def spawn(self, deployer):
             if replica_number_range_end:
                 subsystem.config['dbs.endReplicaNumber'] = replica_number_range_end
 
-
         if subsystem.name == 'kra':
             if config.str2bool(deployer.mdict['pki_kra_ephemeral_requests']):
                 logger.debug('Setting ephemeral requests to true')

base/server/python/pki/server/deployment/scriptlets/configuration.py

@@ -52,10 +52,10 @@ def restore_context(self, mdict):
         # The restocon API is not working in RHEL
         # (see https://issues.redhat.com/browse/RHEL-73348).
         #
-        #selinux.restorecon(mdict['pki_instance_path'], True)
-        #selinux.restorecon(config.PKI_DEPLOYMENT_LOG_ROOT, True)
-        #selinux.restorecon(mdict['pki_instance_log_path'], True)
-        #selinux.restorecon(mdict['pki_instance_configuration_path'], True)
+        # selinux.restorecon(mdict['pki_instance_path'], True)
+        # selinux.restorecon(config.PKI_DEPLOYMENT_LOG_ROOT, True)
+        # selinux.restorecon(mdict['pki_instance_log_path'], True)
+        # selinux.restorecon(mdict['pki_instance_configuration_path'], True)
         folders = [
             mdict['pki_instance_path'],
             config.PKI_DEPLOYMENT_LOG_ROOT,

base/server/python/pki/server/deployment/scriptlets/selinux_setup.py

@@ -1172,7 +1172,7 @@ def update_id_generator(
         cmd.append(generator_object)
 
         self.run(cmd, as_current_user=as_current_user)
-        
+
     def retrieve_config(self, master_url, names, substores, session_id=None, install_token=None):
 
         tmpdir = tempfile.mkdtemp()