From b0af91053d2cf3209342008de7aaadbb97eaf2da Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Thu, 5 Mar 2015 21:35:50 +0100 Subject: [PATCH] Fix API tests after changing SOA-EDIT-API default --- regression-tests.api/test_Zones.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py index a894589b4b..3e0ece4bb8 100644 --- a/regression-tests.api/test_Zones.py +++ b/regression-tests.api/test_Zones.py @@ -50,7 +50,8 @@ class AuthZonesHelperMixin(object): class AuthZones(ApiTestCase, AuthZonesHelperMixin): def test_create_zone(self): - payload, data = self.create_zone(serial=22) + # soa_edit_api has a default, override with empty for this test + payload, data = self.create_zone(serial=22, soa_edit_api='') for k in ('id', 'url', 'name', 'masters', 'kind', 'last_check', 'notified_serial', 'serial', 'soa_edit_api', 'soa_edit', 'account'): self.assertIn(k, data) if k in payload: @@ -389,7 +390,7 @@ fred IN A 192.168.0.4 self.assertEquals(counter[et], 0) def test_export_zone_json(self): - payload, zone = self.create_zone(nameservers=['ns1.foo.com', 'ns2.foo.com']) + payload, zone = self.create_zone(nameservers=['ns1.foo.com', 'ns2.foo.com'], soa_edit_api='') name = payload['name'] # export it r = self.session.get( @@ -406,7 +407,7 @@ fred IN A 192.168.0.4 self.assertEquals(data['zone'].strip().split('\n'), expected_data) def test_export_zone_text(self): - payload, zone = self.create_zone(nameservers=['ns1.foo.com', 'ns2.foo.com']) + payload, zone = self.create_zone(nameservers=['ns1.foo.com', 'ns2.foo.com'], soa_edit_api='') name = payload['name'] # export it r = self.session.get( @@ -1015,7 +1016,7 @@ class AuthRootZone(ApiTestCase, AuthZonesHelperMixin): self.session.delete(self.url("/servers/localhost/zones/=2E")) def test_create_zone(self): - payload, data = self.create_zone(name='', serial=22) + payload, data = self.create_zone(name='', serial=22, soa_edit_api='') for k in ('id', 'url', 'name', 'masters', 'kind', 'last_check', 'notified_serial', 'serial', 'soa_edit_api', 'soa_edit', 'account'): self.assertIn(k, data) if k in payload: -- 2.47.2