Revert "Adapt the regression test to allow absense of deviceName etc."

This reverts commit e596ec138125ea5ccc37f7260767bd94b65b64b6.

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