From: Aki Tuomi <cmouse@desteem.org>
Date: Sat, 1 Aug 2015 05:11:08 +0000 (+0300)
Subject: Update tests
X-Git-Tag: auth-3.4.6~10^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2674%2Fhead;p=thirdparty%2Fpdns.git

Update tests
---

diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py
index 75f306a0dd..adffaa0e80 100644
--- a/regression-tests.api/test_Zones.py
+++ b/regression-tests.api/test_Zones.py
@@ -984,26 +984,26 @@ fred   IN  A      192.168.0.4
         self.create_zone(name=name)
         r = self.session.get(self.url("/servers/localhost/search-data?q=" + name))
         self.assert_success_json(r)
-        print r.json()
-        self.assertEquals(r.json(), [{u'type': u'zone', u'name': name, u'zone_id': name+'.'}])
+        r = [r.json()[0]]
+        self.assertEquals(r, [{u'object_type': u'zone', u'name': name, u'zone_id': 22}])
 
     def test_search_rr_substring(self):
         name = 'search-rr-zone.name'
         self.create_zone(name=name)
-        r = self.session.get(self.url("/servers/localhost/search-data?q=rr-zone"))
+        r = self.session.get(self.url("/servers/localhost/search-data?q=*rr-zone*"))
         self.assert_success_json(r)
         print r.json()
         # should return zone, SOA, ns1, ns2
-        self.assertEquals(len(r.json()), 1)  # FIXME test disarmed for now (should be 4)
+        self.assertEquals(len(r.json()), 4)
 
     def test_search_rr_case_insensitive(self):
         name = 'search-rr-insenszone.name'
         self.create_zone(name=name)
-        r = self.session.get(self.url("/servers/localhost/search-data?q=rr-insensZONE"))
+        r = self.session.get(self.url("/servers/localhost/search-data?q=*rr-insensZONE*"))
         self.assert_success_json(r)
         print r.json()
         # should return zone, SOA, ns1, ns2
-        self.assertEquals(len(r.json()), 1)  # FIXME test disarmed for now (should be 4)
+        self.assertEquals(len(r.json()), 4)
 
 
 @unittest.skipIf(not is_auth(), "Not applicable")