Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Start adding store-and-forward direct-to-device messaging #1046

Merged
merged 6 commits into from
Aug 26, 2016
Merged

Start adding store-and-forward direct-to-device messaging #1046

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e993925
Add store-and-forward direct-to-device messaging
Aug 25, 2016
641efb6
Fix the deduplication of incoming direct-to-device messages
Aug 25, 2016
b162cb2
Add some TODOs
Aug 25, 2016
ab34fde
Merge branch 'develop' into markjh/direct_to_device
Aug 25, 2016
3b8d0ce
More 0_0 in tests
Aug 25, 2016
4bbef62
Merge remote-tracking branch 'origin/develop' into markjh/direct_to_d…
Aug 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More 0_0 in tests
  • Loading branch information
Mark Haines committed Aug 25, 2016
commit 3b8d0ceb227e01bfc5d320a473c8de79124ea9bb
4 changes: 2 additions & 2 deletions tests/rest/client/v1/test_rooms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ def _insert_client_ip(*args, **kwargs):

@defer.inlineCallbacks
def test_topo_token_is_accepted(self):
token = "t1-0_0_0_0_0_0"
token = "t1-0_0_0_0_0_0_0"
(code, response) = yield self.mock_resource.trigger_get(
"/rooms/%s/messages?access_token=x&from=%s" %
(self.room_id, token))
Expand All @@ -1044,7 +1044,7 @@ def test_topo_token_is_accepted(self):

@defer.inlineCallbacks
def test_stream_token_is_accepted_for_fwd_pagianation(self):
token = "s0_0_0_0_0_0"
token = "s0_0_0_0_0_0_0"
(code, response) = yield self.mock_resource.trigger_get(
"/rooms/%s/messages?access_token=x&from=%s" %
(self.room_id, token))
Expand Down