From c5fe3fb8f72b5a1bf49ef7902f8eea771fc1bb54 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Wed, 6 Oct 2021 12:46:39 +0200 Subject: [PATCH] Revert "Adapt the regression test to allow absense of deviceName etc." This reverts commit e596ec138125ea5ccc37f7260767bd94b65b64b6. --- regression-tests.recursor-dnssec/test_Protobuf.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/regression-tests.recursor-dnssec/test_Protobuf.py b/regression-tests.recursor-dnssec/test_Protobuf.py index 3d6a3e4cde..9a634a0b09 100644 --- 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) -- 2.47.2