Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

This commit is contained in:
ADS Merger
2020-07-15 23:51:18 +00:00
parent aae013d498
commit 9d3f12d0b7
554 changed files with 15159 additions and 8223 deletions

View File

@@ -37,7 +37,7 @@ suite('UserDataAutoSyncService', () => {
await client.setUp();
// Sync once and reset requests
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
target.reset();
const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
@@ -59,7 +59,7 @@ suite('UserDataAutoSyncService', () => {
await client.setUp();
// Sync once and reset requests
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
target.reset();
const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
@@ -85,7 +85,7 @@ suite('UserDataAutoSyncService', () => {
await client.setUp();
// Sync once and reset requests
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
target.reset();
const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
@@ -107,7 +107,7 @@ suite('UserDataAutoSyncService', () => {
await client.setUp();
// Sync once and reset requests
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
target.reset();
const testObject: UserDataAutoSyncService = client.instantiationService.createInstance(TestUserDataAutoSyncService);
@@ -245,7 +245,7 @@ suite('UserDataAutoSyncService', () => {
// Set up and sync from the client
const client = disposableStore.add(new UserDataSyncClient(target));
await client.setUp();
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
// Set up and sync from the test client
const testClient = disposableStore.add(new UserDataSyncClient(target));
@@ -334,7 +334,7 @@ suite('UserDataAutoSyncService', () => {
// Set up and sync from the client
const client = disposableStore.add(new UserDataSyncClient(target));
await client.setUp();
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
// Set up and sync from the test client
const testClient = disposableStore.add(new UserDataSyncClient(target));
@@ -346,7 +346,7 @@ suite('UserDataAutoSyncService', () => {
await client.instantiationService.get(IUserDataSyncService).reset();
// Sync again from the first client to create new session
await client.instantiationService.get(IUserDataSyncService).sync();
await (await client.instantiationService.get(IUserDataSyncService).createSyncTask()).run();
// Sync from the test client
target.reset();
@@ -383,5 +383,4 @@ suite('UserDataAutoSyncService', () => {
assert.deepEqual((<UserDataSyncStoreError>e).code, UserDataSyncErrorCode.TooManyRequests);
});
});