From 0a875ed7de77ebaf2955787ec17f96747c8533f8 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Mon, 20 Jan 2020 00:23:40 -0500 Subject: [PATCH] remove fmsgids from multiline --- irctest/server_tests/test_multiline.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/irctest/server_tests/test_multiline.py b/irctest/server_tests/test_multiline.py index 42ddbeb..f436087 100644 --- a/irctest/server_tests/test_multiline.py +++ b/irctest/server_tests/test_multiline.py @@ -7,7 +7,6 @@ from irctest import cases CAP_NAME = 'draft/multiline' BATCH_TYPE = 'draft/multiline' CONCAT_TAG = 'draft/multiline-concat' -FMSGID_TAG = 'draft/fmsgid' base_caps = ['message-tags', 'batch', 'echo-message', 'server-time'] @@ -44,13 +43,11 @@ class MultilineTestCase(cases.BaseServerTestCase, cases.OptionalityHelper): time = batchStart.tags.get('time') assert msgid assert time - fmsgids = [] privmsgs = echo[1:-1] for msg in privmsgs: self.assertMessageEqual(msg, command='PRIVMSG') self.assertNotIn('msgid', msg.tags) self.assertNotIn('time', msg.tags) - fmsgids.append(msg.tags.get(FMSGID_TAG)) self.assertIn(CONCAT_TAG, echo[3].tags) relay = self.getMessages(2) @@ -61,7 +58,6 @@ class MultilineTestCase(cases.BaseServerTestCase, cases.OptionalityHelper): self.assertEqual(batchStart.tags.get('msgid'), msgid) self.assertEqual(batchStart.tags.get('time'), time) privmsgs = relay[1:-1] - self.assertEqual([msg.tags.get(FMSGID_TAG) for msg in privmsgs], fmsgids) for msg in privmsgs: self.assertMessageEqual(msg, command='PRIVMSG') self.assertNotIn('msgid', msg.tags) @@ -75,4 +71,4 @@ class MultilineTestCase(cases.BaseServerTestCase, cases.OptionalityHelper): relayed_fmsgids.append(msg.tags.get('msgid')) self.assertEqual(msg.tags.get('time'), time) self.assertNotIn(CONCAT_TAG, msg.tags) - self.assertEqual(fmsgids, relayed_fmsgids) + self.assertEqual(relayed_fmsgids, [msgid] + [None]*(len(fallback_relay)-1))