From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 20 Oct 2020 12:11:31 +0000 (+0200)
Subject: Adapt the regression test to allow absense of deviceName etc.
X-Git-Tag: dnsdist-1.6.0-alpha0~11^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e596ec138125ea5ccc37f7260767bd94b65b64b6;p=thirdparty%2Fpdns.git

Adapt the regression test to allow absense of deviceName etc.

Checked with Wojas that this should be allowed. No use including fields that
have as value the empty string.
---

diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py
index b4ecc610c5..e72d7a0c50 100644
--- a/regression-tests.recursor-dnssec/test_Protobuf.py
+++ b/regression-tests.recursor-dnssec/test_Protobuf.py
@@ -237,9 +237,10 @@ class TestRecursorProtobuf(RecursorTest):
         self.assertEquals(msg.response.rcode, 65536)
 
     def checkProtobufIdentity(self, msg, requestorId, deviceId, deviceName):
-        self.assertTrue(msg.HasField('requestorId'))
-        self.assertTrue(msg.HasField('deviceId'))
-        self.assertTrue(msg.HasField('deviceName'))
+        print(msg)
+        self.assertTrue((requestorId == '') == (not msg.HasField('requestorId')))
+        self.assertTrue((deviceId == '') == (not msg.HasField('deviceId')))
+        self.assertTrue((deviceName == '') == (not msg.HasField('deviceName')))
         self.assertEquals(msg.requestorId, requestorId)
         self.assertEquals(msg.deviceId, deviceId)
         self.assertEquals(msg.deviceName, deviceName)