diff --git a/irctest/server_tests/test_resume.py b/irctest/server_tests/test_resume.py index 99bf9e6..b88338c 100644 --- a/irctest/server_tests/test_resume.py +++ b/irctest/server_tests/test_resume.py @@ -22,7 +22,7 @@ class ResumeTestCase(cases.BaseServerTestCase): self.connectClient('bar', capabilities=['batch', 'draft/labeled-response', 'server-time']) ms = self.getMessages(1) - welcome = self.connectClient('baz', capabilities=['batch', 'draft/labeled-response', 'server-time', 'draft/resume-0.4']) + welcome = self.connectClient('baz', capabilities=['batch', 'draft/labeled-response', 'server-time', 'draft/resume-0.5']) resume_messages = [m for m in welcome if m.command == 'RESUME'] self.assertEqual(len(resume_messages), 1) self.assertEqual(resume_messages[0].params[0], 'TOKEN') @@ -46,7 +46,7 @@ class ResumeTestCase(cases.BaseServerTestCase): bad_token = 'a' * len(token) self.addClient() self.sendLine(3, 'CAP LS') - self.sendLine(3, 'CAP REQ :batch draft/labeled-response server-time draft/resume-0.4') + self.sendLine(3, 'CAP REQ :batch draft/labeled-response server-time draft/resume-0.5') self.sendLine(3, 'NICK tempnick') self.sendLine(3, 'USER tempuser 0 * tempuser') self.sendLine(3, ' '.join(('RESUME', bad_token, ANCIENT_TIMESTAMP))) @@ -62,7 +62,7 @@ class ResumeTestCase(cases.BaseServerTestCase): self.addClient() self.sendLine(4, 'CAP LS') - self.sendLine(4, 'CAP REQ :batch draft/labeled-response server-time draft/resume-0.4') + self.sendLine(4, 'CAP REQ :batch draft/labeled-response server-time draft/resume-0.5') self.sendLine(4, 'NICK tempnick_') self.sendLine(4, 'USER tempuser 0 * tempuser') # resume with a timestamp in the distant past @@ -108,10 +108,10 @@ class ResumeTestCase(cases.BaseServerTestCase): # test chain-resuming (resuming the resumed connection, using the new token) self.addClient() self.sendLine(5, 'CAP LS') - self.sendLine(5, 'CAP REQ :batch draft/labeled-response server-time draft/resume-0.4') + self.sendLine(5, 'CAP REQ :batch draft/labeled-response server-time draft/resume-0.5') self.sendLine(5, 'NICK tempnick_') self.sendLine(5, 'USER tempuser 0 * tempuser') - self.sendLine(5, 'RESUME ' + new_token) + self.sendLine(5, 'RESUME ' + new_token + ' ' + ANCIENT_TIMESTAMP) ms = self.getMessages(5) resume_messages = [m for m in ms if m.command == 'RESUME'] @@ -130,7 +130,7 @@ class ResumeTestCase(cases.BaseServerTestCase): ms = self.getMessages(1) self.joinChannel(1, '#xyz') - welcome = self.connectClient('baz', capabilities=['batch', 'draft/labeled-response', 'server-time', 'draft/resume-0.4']) + welcome = self.connectClient('baz', capabilities=['batch', 'draft/labeled-response', 'server-time', 'draft/resume-0.5']) resume_messages = [m for m in welcome if m.command == 'RESUME'] self.assertEqual(len(resume_messages), 1) self.assertEqual(resume_messages[0].params[0], 'TOKEN') @@ -153,7 +153,7 @@ class ResumeTestCase(cases.BaseServerTestCase): self.assertMessageEqual(self.getMessage(1), command=RPL_AWAY, params=['bar', 'baz', 'software upgrade']) self.addClient(3) - self.sendLine(3, 'CAP REQ :batch account-tag message-tags draft/resume-0.4') + self.sendLine(3, 'CAP REQ :batch account-tag message-tags draft/resume-0.5') self.sendLine(3, ' '.join(('RESUME', token, ANCIENT_TIMESTAMP))) ms = self.getMessages(3)