From: Kees Monshouwer Date: Sun, 17 Aug 2014 18:20:03 +0000 (+0200) Subject: remove priority from api tests X-Git-Tag: rec-3.7.0-rc1~189^2~5^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05cf6a71fc0434a307149163db6e99c1fc9e37e9;p=thirdparty%2Fpdns.git remove priority from api tests --- diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py index 4d1057e1c1..eb2992ee4a 100644 --- a/regression-tests.api/test_Zones.py +++ b/regression-tests.api/test_Zones.py @@ -81,7 +81,6 @@ class AuthZones(ApiTestCase): { "name": name, "type": "A", - "priority": 0, "ttl": 3600, "content": "4.3.2.1", "disabled": False @@ -112,7 +111,6 @@ class AuthZones(ApiTestCase): { "name": name, "type": "SOA", - "priority": 0, "ttl": 3600, "content": "ns1.example.net testmaster@example.net 10 10800 3600 604800 3600", "disabled": False @@ -272,7 +270,7 @@ powerdns.com. 86400 IN SOA powerdnssec1.ds9a.nl. ahu.ds9a.n 'SOA': [ { 'content': 'powerdnssec1.ds9a.nl. ahu.ds9a.nl. 1343746984 10800 3600 604800 10800' } ], 'MX': [ - { 'content': 'xs.powerdns.com.', 'priority': 0 } ], + { 'content': '0 xs.powerdns.com.' } ], 'A': [ { 'content': '82.94.213.34', 'name': 'powerdns.com' } ], 'AAAA': [ @@ -288,10 +286,6 @@ powerdns.com. 86400 IN SOA powerdnssec1.ds9a.nl. ahu.ds9a.n if ret['name'] == ev['name'] and ret['content'] == ev['content'].rstrip('.'): counter[et] = counter[et]-1 continue - if 'priority' in ev: - if ret['priority'] == ev['priority'] and ret['content'] == ev['content'].rstrip('.'): - counter[et] = counter[et]-1 - continue if ret['content'] == ev['content'].rstrip('.'): counter[et] = counter[et]-1 self.assertEquals(counter[et], 0) @@ -339,7 +333,7 @@ fred IN A 192.168.0.4 'SOA': [ { 'content': 'ns1.example.org. hostmaster.example.org. 2002022401 10800 15 604800 10800' } ], 'MX': [ - { 'content': 'mail.another.com.', 'priority': 10 } ], + { 'content': '10 mail.another.com.' } ], 'A': [ { 'content': '192.168.0.1', 'name': 'ns1.example.org' }, { 'content': '192.168.0.2', 'name': 'www.example.org' }, @@ -358,10 +352,6 @@ fred IN A 192.168.0.4 if ret['name'] == ev['name'] and ret['content'] == ev['content'].rstrip('.'): counter[et] = counter[et]-1 continue - if 'priority' in ev: - if ret['priority'] == ev['priority'] and ret['content'] == ev['content'].rstrip('.'): - counter[et] = counter[et]-1 - continue if ret['content'] == ev['content'].rstrip('.'): counter[et] = counter[et]-1 self.assertEquals(counter[et], 0) @@ -445,7 +435,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "NS", - "priority": 0, "ttl": 3600, "content": "ns1.bar.com", "disabled": False @@ -453,7 +442,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "NS", - "priority": 0, "ttl": 1800, "content": "ns2-disabled.bar.com", "disabled": True @@ -473,7 +461,7 @@ fred IN A 192.168.0.4 self.assertEquals(recs, rrset['records']) def test_zone_rr_update_mx(self): - # Important to test with MX records, as they have a priority field, which must not end up in the content field. + # Important to test with MX records, as they have a priority field, which must end up in the content field. payload, zone = self.create_zone() name = payload['name'] # do a replace (= update) @@ -485,9 +473,8 @@ fred IN A 192.168.0.4 { "name": name, "type": "MX", - "priority": 10, "ttl": 3600, - "content": "mail.example.org", + "content": "10 mail.example.org", "disabled": False } ] @@ -515,7 +502,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "NS", - "priority": 0, "ttl": 3600, "content": "ns9999.example.com", "disabled": False @@ -530,9 +516,8 @@ fred IN A 192.168.0.4 { "name": name, "type": "MX", - "priority": 10, "ttl": 3600, - "content": "mx444.example.com", + "content": "10 mx444.example.com", "disabled": False } ] @@ -585,7 +570,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "SOA", - "priority": 0, "ttl": 3600, "content": "ns1.bar.com hostmaster.foo.org 1 1 1 1 1", "disabled": True @@ -634,7 +618,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "NS", - "priority": 0, "ttl": 3600, "content": "ns1.bar.com", "disabled": False @@ -660,7 +643,6 @@ fred IN A 192.168.0.4 { "name": 'blah.'+name, "type": "NS", - "priority": 0, "ttl": 3600, "content": "ns1.bar.com", "disabled": False @@ -686,7 +668,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "NS", - "priority": 0, "ttl": 3600, "content": "ns1.bar.com", "disabled": False @@ -814,7 +795,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "NS", - "priority": 0, "ttl": 3600, "content": "ns1.bar.com", "disabled": False @@ -854,7 +834,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "A", - "priority": 0, "ttl": 3600, "content": '192.2.0.2', "disabled": False, @@ -876,7 +855,6 @@ fred IN A 192.168.0.4 u'content': name, u'disabled': False, u'ttl': 3600, - u'priority': 0, u'type': u'PTR', u'name': u'2.0.2.192.in-addr.arpa' }]) @@ -896,7 +874,6 @@ fred IN A 192.168.0.4 { "name": name, "type": "AAAA", - "priority": 0, "ttl": 3600, "content": '2001:DB8::bb:aa', "disabled": False, @@ -918,7 +895,6 @@ fred IN A 192.168.0.4 u'content': name, u'disabled': False, u'ttl': 3600, - u'priority': 0, u'type': u'PTR', u'name': u'a.a.0.0.b.b.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa' }])