Fix flaky test with transactions (#7187)
* Fix flaky test with transactions * Add CHANGELOG entry * Fix the other transactions related tests that became flaky because now Parse Server tries to submit the transaction multilpe times in the case of TransientError * Remove fit from tests
This commit is contained in:
committed by
GitHub
parent
9a9fc5fa5f
commit
a430d6f7b7
@@ -197,7 +197,7 @@ describe('ParseServerRESTController', () => {
|
||||
.then(() => {
|
||||
spyOn(databaseAdapter, 'createObject').and.callThrough();
|
||||
|
||||
RESTController.request('POST', 'batch', {
|
||||
return RESTController.request('POST', 'batch', {
|
||||
requests: [
|
||||
{
|
||||
method: 'POST',
|
||||
@@ -218,11 +218,14 @@ describe('ParseServerRESTController', () => {
|
||||
expect(response[1].success.objectId).toBeDefined();
|
||||
expect(response[1].success.createdAt).toBeDefined();
|
||||
const query = new Parse.Query('MyObject');
|
||||
query.find().then(results => {
|
||||
expect(databaseAdapter.createObject.calls.count()).toBe(2);
|
||||
expect(databaseAdapter.createObject.calls.argsFor(0)[3]).toBe(
|
||||
databaseAdapter.createObject.calls.argsFor(1)[3]
|
||||
);
|
||||
return query.find().then(results => {
|
||||
expect(databaseAdapter.createObject.calls.count() % 2).toBe(0);
|
||||
expect(databaseAdapter.createObject.calls.count() > 0).toEqual(true);
|
||||
for (let i = 0; i + 1 < databaseAdapter.createObject.calls.length; i = i + 2) {
|
||||
expect(databaseAdapter.createObject.calls.argsFor(i)[3]).toBe(
|
||||
databaseAdapter.createObject.calls.argsFor(i + 1)[3]
|
||||
);
|
||||
}
|
||||
expect(results.map(result => result.get('key')).sort()).toEqual([
|
||||
'value1',
|
||||
'value2',
|
||||
@@ -230,7 +233,8 @@ describe('ParseServerRESTController', () => {
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
})
|
||||
.catch(done.fail);
|
||||
});
|
||||
|
||||
it('should not save anything when one operation fails in a transaction', done => {
|
||||
@@ -513,18 +517,18 @@ describe('ParseServerRESTController', () => {
|
||||
const results3 = await query3.find();
|
||||
expect(results3.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
|
||||
|
||||
expect(databaseAdapter.createObject.calls.count()).toBe(13);
|
||||
expect(databaseAdapter.createObject.calls.count() >= 13).toEqual(true);
|
||||
let transactionalSession;
|
||||
let transactionalSession2;
|
||||
let myObjectDBCalls = 0;
|
||||
let myObject2DBCalls = 0;
|
||||
let myObject3DBCalls = 0;
|
||||
for (let i = 0; i < 13; i++) {
|
||||
for (let i = 0; i < databaseAdapter.createObject.calls.count(); i++) {
|
||||
const args = databaseAdapter.createObject.calls.argsFor(i);
|
||||
switch (args[0]) {
|
||||
case 'MyObject':
|
||||
myObjectDBCalls++;
|
||||
if (!transactionalSession) {
|
||||
if (!transactionalSession || (myObjectDBCalls - 1) % 2 === 0) {
|
||||
transactionalSession = args[3];
|
||||
} else {
|
||||
expect(transactionalSession).toBe(args[3]);
|
||||
@@ -535,7 +539,7 @@ describe('ParseServerRESTController', () => {
|
||||
break;
|
||||
case 'MyObject2':
|
||||
myObject2DBCalls++;
|
||||
if (!transactionalSession2) {
|
||||
if (!transactionalSession2 || (myObject2DBCalls - 1) % 9 === 0) {
|
||||
transactionalSession2 = args[3];
|
||||
} else {
|
||||
expect(transactionalSession2).toBe(args[3]);
|
||||
@@ -550,9 +554,12 @@ describe('ParseServerRESTController', () => {
|
||||
break;
|
||||
}
|
||||
}
|
||||
expect(myObjectDBCalls).toEqual(2);
|
||||
expect(myObject2DBCalls).toEqual(9);
|
||||
expect(myObject3DBCalls).toEqual(2);
|
||||
expect(myObjectDBCalls % 2).toEqual(0);
|
||||
expect(myObjectDBCalls > 0).toEqual(true);
|
||||
expect(myObject2DBCalls % 9).toEqual(0);
|
||||
expect(myObject2DBCalls > 0).toEqual(true);
|
||||
expect(myObject3DBCalls % 2).toEqual(0);
|
||||
expect(myObject3DBCalls > 0).toEqual(true);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -228,10 +228,13 @@ describe('batch', () => {
|
||||
expect(response.data[1].success.createdAt).toBeDefined();
|
||||
const query = new Parse.Query('MyObject');
|
||||
query.find().then(results => {
|
||||
expect(databaseAdapter.createObject.calls.count()).toBe(2);
|
||||
expect(databaseAdapter.createObject.calls.argsFor(0)[3]).toBe(
|
||||
databaseAdapter.createObject.calls.argsFor(1)[3]
|
||||
);
|
||||
expect(databaseAdapter.createObject.calls.count() % 2).toBe(0);
|
||||
expect(databaseAdapter.createObject.calls.count() > 0).toEqual(true);
|
||||
for (let i = 0; i + 1 < databaseAdapter.createObject.calls.length; i = i + 2) {
|
||||
expect(databaseAdapter.createObject.calls.argsFor(i)[3]).toBe(
|
||||
databaseAdapter.createObject.calls.argsFor(i + 1)[3]
|
||||
);
|
||||
}
|
||||
expect(results.map(result => result.get('key')).sort()).toEqual([
|
||||
'value1',
|
||||
'value2',
|
||||
@@ -542,18 +545,18 @@ describe('batch', () => {
|
||||
const results3 = await query3.find();
|
||||
expect(results3.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
|
||||
|
||||
expect(databaseAdapter.createObject.calls.count()).toBe(13);
|
||||
expect(databaseAdapter.createObject.calls.count() >= 13).toEqual(true);
|
||||
let transactionalSession;
|
||||
let transactionalSession2;
|
||||
let myObjectDBCalls = 0;
|
||||
let myObject2DBCalls = 0;
|
||||
let myObject3DBCalls = 0;
|
||||
for (let i = 0; i < 13; i++) {
|
||||
for (let i = 0; i < databaseAdapter.createObject.calls.count(); i++) {
|
||||
const args = databaseAdapter.createObject.calls.argsFor(i);
|
||||
switch (args[0]) {
|
||||
case 'MyObject':
|
||||
myObjectDBCalls++;
|
||||
if (!transactionalSession) {
|
||||
if (!transactionalSession || (myObjectDBCalls - 1) % 2 === 0) {
|
||||
transactionalSession = args[3];
|
||||
} else {
|
||||
expect(transactionalSession).toBe(args[3]);
|
||||
@@ -564,7 +567,7 @@ describe('batch', () => {
|
||||
break;
|
||||
case 'MyObject2':
|
||||
myObject2DBCalls++;
|
||||
if (!transactionalSession2) {
|
||||
if (!transactionalSession2 || (myObject2DBCalls - 1) % 9 === 0) {
|
||||
transactionalSession2 = args[3];
|
||||
} else {
|
||||
expect(transactionalSession2).toBe(args[3]);
|
||||
@@ -579,9 +582,12 @@ describe('batch', () => {
|
||||
break;
|
||||
}
|
||||
}
|
||||
expect(myObjectDBCalls).toEqual(2);
|
||||
expect(myObject2DBCalls).toEqual(9);
|
||||
expect(myObject3DBCalls).toEqual(2);
|
||||
expect(myObjectDBCalls % 2).toEqual(0);
|
||||
expect(myObjectDBCalls > 0).toEqual(true);
|
||||
expect(myObject2DBCalls % 9).toEqual(0);
|
||||
expect(myObject2DBCalls > 0).toEqual(true);
|
||||
expect(myObject3DBCalls % 2).toEqual(0);
|
||||
expect(myObject3DBCalls > 0).toEqual(true);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user