Merge pull request #8223 from PowerDNS/omoerbeek-patch-1

[thirdparty/pdns.git] / regression-tests.api / test_TSIG.py

diff --git a/regression-tests.api/test_TSIG.py b/regression-tests.api/test_TSIG.py
index 59a595a175786ef40165dc64ad641f0f089c4370..88715cf219cb33fa4cae8c960df4298e200d38bc 100644 (file)
--- a/regression-tests.api/test_TSIG.py
+++ b/regression-tests.api/test_TSIG.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import json
 import time
 import unittest
@@ -15,7 +16,7 @@ class AuthTSIGHelperMixin(object):
         }
         if key is not None:
             payload.update({'key': key})
-        print "sending", payload
+        print("sending", payload)
         r = self.session.post(
             self.url("/api/v1/servers/localhost/tsigkeys"),
             data=json.dumps(payload),
@@ -23,7 +24,7 @@ class AuthTSIGHelperMixin(object):
         self.assert_success_json(r)
         self.assertEquals(r.status_code, 201)
         reply = r.json()
-        print "reply", reply
+        print("reply", reply)
         return name, payload, reply
 
 
@@ -137,7 +138,7 @@ class AuthTSIG(ApiTestCase, AuthTSIGHelperMixin):
     def test_put_broken_key(self):
         name, payload, data = self.create_tsig_key()
         payload = {
-            'key': 'f\u333oobar1======'
+            'key': 'f\u0333oobar1======'
         }
         r = self.session.put(self.url("/api/v1/servers/localhost/tsigkeys/" + data['id']),
                              data=json.dumps(payload))
@@ -169,7 +170,7 @@ class AuthTSIG(ApiTestCase, AuthTSIGHelperMixin):
     def test_post_broken_key_name(self):
         payload = {
             'name': unique_tsigkey_name(),
-            'key': 'f\u333oobar1======',
+            'key': 'f\u0333oobar1======',
             'algorithm': 'hmac-md5'
         }
         r = self.session.post(self.url("/api/v1/servers/localhost/tsigkeys"),
@@ -187,6 +188,6 @@ class AuthTSIG(ApiTestCase, AuthTSIGHelperMixin):
         r = self.session.post(self.url("/api/v1/servers/localhost/tsigkeys"),
                               headers={'accept': 'application/json'},
                               data=json.dumps(payload))
-        self.assertEqual(r.status_code, 422)
+        self.assertEqual(r.status_code, 400)
         data = r.json()
-        self.assertIn('Unknown TSIG algorithm: ', data['error'])
+        self.assertIn('Invalid TSIG algorithm: ', data['error'])