Include config in error output

Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>

Author: c00kiemon5ter

src/xmlsec/test/__init__.py

@@ -30,7 +30,10 @@ def run_cmd(args, softhsm_conf=None):
         logging.debug(out)
     rv = proc.wait()
     if rv:
-        msg = '[exit-code: {code}] [stdout: {out}] [stderr: {err}]'.format(
-            code=rv, out=out.strip(), err=err.strip(),
+        with open(softhsm_conf) as f:
+            conf = f.read()
+        msg = '[code: {code}] [stdout: {out}] [stderr: {err}] [config: {conf}]'
+        msg = msg.format(
+            code=rv, out=out.strip(), err=err.strip(), conf=conf,
         )
         raise RuntimeError(msg)

src/xmlsec/test/p11_test.py

@@ -39,7 +39,6 @@
     'P11_MODULE': [
         '/usr/lib/softhsm/libsofthsm2.so',
         '/usr/lib/softhsm/libsofthsm.so',
-        '/usr/lib/libsofthsm.so',
     ],
     'P11_ENGINE': [
         '/usr/lib/ssl/engines/libpkcs11.so',
@@ -114,11 +113,18 @@ def setup():
         with open(softhsm_conf, "w") as f:
             if softhsm_version == 2:
                 softhsm_db = _td()
-                f.write("#Generated by pyXMLSecurity test\ndirectories.tokendir = %s\nobjectstore.backend = file\nlog.level = DEBUG\n"%softhsm_db)
-
+                f.write("""
+# Generated by pyXMLSecurity test
+directories.tokendir = %s
+objectstore.backend = file
+log.level = DEBUG
+""" % softhsm_db)
             else:
                 softhsm_db = _tf()
-                f.write("#Generated by pyXMLSecurity test\n0:%s\n" % softhsm_db)
+                f.write("""
+# Generated by pyXMLSecurity test
+0:%s
+""" % softhsm_db)
 
         logging.debug("Initializing the token")
         run_cmd([component_path['SOFTHSM'],