diff options
| author | Erik Johnston <erikj@jki.re> | 2017-03-15 17:37:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 17:37:15 +0000 |
| commit | 54d2b7e596ffe330b8354d6ca78ee6ca6b7e6484 (patch) | |
| tree | 922a54caf1885a43c2229fcd8a1ea66044a2d5e9 /tests/handlers/test_presence.py | |
| parent | Merge pull request #2013 from matrix-org/erikj/presence_FASTER (diff) | |
| parent | Modify test_user_sync so it doesn't look at last_active_ts over last_user_syn... (diff) | |
| download | synapse-54d2b7e596ffe330b8354d6ca78ee6ca6b7e6484.tar.xz | |
Merge pull request #2014 from Half-Shot/hs/fix-appservice-presence
Add fallback to last_active_ts if it beats the last sync time on a presence timeout.
Diffstat (limited to 'tests/handlers/test_presence.py')
| -rw-r--r-- | tests/handlers/test_presence.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index d9e8f634ae..de06a6ad30 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -324,7 +324,7 @@ class PresenceTimeoutTestCase(unittest.TestCase): state = UserPresenceState.default(user_id) state = state.copy_and_replace( state=PresenceState.ONLINE, - last_active_ts=now, + last_active_ts=0, last_user_sync_ts=now - SYNC_ONLINE_TIMEOUT - 1, ) |