mplexer: Add some unit tests for our multiplexers

[thirdparty/pdns.git] / regression-tests.auth-py / authtests.py

diff --git a/regression-tests.auth-py/authtests.py b/regression-tests.auth-py/authtests.py
index 61073234e1d6257cee7d1e43a56d56e593f53059..d04eb3dc4a67ffd2d0fc5cac3fd14fadef346831 100644 (file)
--- a/regression-tests.auth-py/authtests.py
+++ b/regression-tests.auth-py/authtests.py
@@ -124,8 +124,7 @@ distributor-threads=1""".format(confdir=confdir, prefix=cls._PREFIX,
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print(e.output)
-            raise
+            raise AssertionError('%s failed (%d): %s' % (pdnsutilCmd, e.returncode, e.output))
 
     @classmethod
     def secureZone(cls, confdir, zonename, key=None):
@@ -152,8 +151,7 @@ distributor-threads=1""".format(confdir=confdir, prefix=cls._PREFIX,
         try:
             subprocess.check_output(pdnsutilCmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
-            print(e.output)
-            raise
+            raise AssertionError('%s failed (%d): %s' % (pdnsutilCmd, e.returncode, e.output))
 
     @classmethod
     def generateAllAuthConfig(cls, confdir):
@@ -177,7 +175,7 @@ distributor-threads=1""".format(confdir=confdir, prefix=cls._PREFIX,
         authcmd.append('--local-address=%s' % ipaddress)
         authcmd.append('--local-port=%s' % cls._authPort)
         authcmd.append('--loglevel=9')
-        authcmd.append('--enable-lua-record')
+        authcmd.append('--enable-lua-records')
         print(' '.join(authcmd))
 
         logFile = os.path.join(confdir, 'pdns.log')