From: Pieter Lexis Date: Fri, 25 May 2018 11:59:30 +0000 (+0200) Subject: API: Fix TSIG tests X-Git-Tag: auth-4.2.0-alpha1~17^2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa39af547729299d47277fba0e9c57a5c915bdbe;p=thirdparty%2Fpdns.git API: Fix TSIG tests --- diff --git a/regression-tests.api/test_TSIG.py b/regression-tests.api/test_TSIG.py index 59a595a175..ffada31fb8 100644 --- 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"), diff --git a/regression-tests.api/test_helper.py b/regression-tests.api/test_helper.py index bca9b0928f..471b906f11 100644 --- a/regression-tests.api/test_helper.py +++ b/regression-tests.api/test_helper.py @@ -1,3 +1,4 @@ +from __future__ import print_function from datetime import datetime import os import requests @@ -105,6 +106,6 @@ def get_db_tsigkeys(keyname): FROM tsigkeys WHERE name = ?""", (keyname, )).fetchall() keys = [{'name': row[0], 'algorithm': row[1], 'secret': row[2]} for row in rows] - print "DB TSIG keys:", keys + print("DB TSIG keys:", keys) return keys