Skip to content

[stable26] Fix sync errors after network issues #4487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 12 commits into from
Jul 11, 2023
Merged

[stable26] Fix sync errors after network issues #4487

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ce4e525
test(sync): yjs sync via sync service
max-nextcloud Jul 3, 2023
d67f6b8
wip: test yjs chattiness
max-nextcloud Jul 5, 2023
8f06755
fix(sync): keep queue content on failed requests
max-nextcloud Jul 10, 2023
27f3994
test(syncservice): Apply Yjs steps in wrong order
mejo- Jul 5, 2023
cf2eeb2
test(sync): improve cypress tests for missing messages
max-nextcloud Jul 10, 2023
3b8bba9
fix(sync): sending steps with interval in wrapper function
max-nextcloud Jul 10, 2023
44c3d7f
fix(editor): Don't reconnect Editor on connection issues
mejo- Jul 10, 2023
fc5a1a2
test(cypress): Fix code syntax to please eslint
mejo- Jul 10, 2023
5b62129
fix(test): wait longer for file could not be found message
max-nextcloud Jul 11, 2023
2d1dffc
fix(sync): Allow to pass `disableBc` to `createSyncServiceProvider()`
mejo- Jul 11, 2023
76dec33
test(sync): cleanup Cypress tests
mejo- Jul 11, 2023
dda9034
chore(assets): Recompile assets
nextcloud-command Jul 11, 2023
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
test(sync): improve cypress tests for missing messages 
Signed-off-by: Max <[email protected]>
  • Loading branch information
@max-nextcloud @mejo-
max-nextcloud authored and mejo- committed Jul 11, 2023
commit cf2eeb291360c0dc40043097b3d4b5b4c21c6cc5
83 changes: 47 additions & 36 deletions cypress/e2e/api/SyncServiceProvider.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ describe('Sync service provider', function() {
.then(id => {
fileId = id
})
cy.wrap(new Doc()).as('source')
cy.wrap(new Doc()).as('target')
cy.get('@source').then(source => createProvider(source)).as('sourceProvider')
cy.get('@target').then(target => createProvider(target)).as('targetProvider')
})

afterEach(function() {
this.sourceProvider?.destroy()
this.targetProvider?.destroy()
})

function createProvider(ydoc) {
Expand All @@ -62,12 +71,8 @@ describe('Sync service provider', function() {
}

it('syncs even when initial state was present', function() {
const source = new Doc()
const target = new Doc()
const sourceProvider = createProvider(source)
const targetProvider = createProvider(target)
const sourceMap = source.getMap()
const targetMap = target.getMap()
const sourceMap = this.source.getMap()
const targetMap = this.target.getMap()
sourceMap.set('unrelated', 'value')
cy.intercept({ method: 'POST', url: '**/apps/text/session/push' })
.as('push')
Expand All @@ -83,18 +88,12 @@ describe('Sync service provider', function() {
cy.wait(1000)
cy.then(() => {
expect(targetMap.get('keyA')).to.be.eq('valueA')
sourceProvider.destroy()
targetProvider.destroy()
})
})

it('recovers from a dropped message', function() {
const source = new Doc()
const target = new Doc()
const sourceProvider = createProvider(source)
const targetProvider = createProvider(target)
const sourceMap = source.getMap()
const targetMap = target.getMap()
it.only('recovers from a dropped message', function() {
const sourceMap = this.source.getMap()
const targetMap = this.target.getMap()
cy.intercept({ method: 'POST', url: '**/apps/text/session/push' })
.as('push')
cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' })
Expand All @@ -111,38 +110,52 @@ describe('Sync service provider', function() {
expect(targetMap.get('keyA')).to.be.eq('valueA')
})
let count = 0
cy.intercept({ method: 'POST', url: '**/apps/text/session/push' }, req => {
if (count < 2) {
req.destroy()
req.alias = 'dead'
count += 1
} else {
req.continue()
req.alias = 'alive'
}
cy.intercept({
method: 'POST',
url: '**/apps/text/session/push',
}, req => {
if (req.body.steps) {
req.reply({ forceNetworkError: true })
req.alias = 'dead'
} else {
req.continue()
}
})
cy.then(() => {
sourceMap.set('keyB', 'valueB')
expect(targetMap.get('keyB')).to.be.undefined
})
cy.wait('@dead')
cy.wait('@sync')
cy.wait('@sync')
cy.then(() => {
expect(targetMap.get('keyB')).to.be.undefined
})
cy.intercept({
method: 'POST',
url: '**/apps/text/session/push',
}, req => {
if (req.body.steps) {
req.alias = 'alive'
req.continue()
} else {
req.continue()
}
})
cy.then(() => {
sourceMap.set('keyC', 'valueC')
expect(targetMap.get('keyC')).to.be.undefined
})
cy.wait('@alive')
cy.wait('@alive')
cy.wait(1000)
cy.then(() => {
expect(targetMap.get('keyC')).to.be.eq('valueC')
expect(targetMap.get('keyB')).to.be.eq('valueB')
sourceProvider.destroy()
targetProvider.destroy()
})
})

it('is not too chatty', function() {
const source = new Doc()
const target = new Doc()
const sourceProvider = createProvider(source)
const targetProvider = createProvider(target)
const sourceMap = source.getMap()
const targetMap = target.getMap()
const sourceMap = this.source.getMap()
const targetMap = this.target.getMap()
cy.intercept({ method: 'POST', url: '**/apps/text/session/push' })
.as('push')
cy.intercept({ method: 'POST', url: '**/apps/text/session/sync' })
Expand All @@ -155,8 +168,6 @@ describe('Sync service provider', function() {
cy.wait(60000)
cy.then(() => {
expect(targetMap.get('keyA')).to.be.eq('valueA')
sourceProvider.destroy()
targetProvider.destroy()
})
// 2 clients push awareness updates every 15 seconds -> 2*5 = 10. Actual 15.
cy.get('@push.all').its('length').should('be.lessThan', 30)
Expand Down