fix test

aeschli · aeschli · commit bcba7a5d80f9 · 2019-02-06T22:24:08.000+01:00
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -252,6 +252,7 @@ export class BackupMainService implements IBackupMainService {
 		// Validate Workspaces
 		for (let workspace of rootWorkspaces) {
 			if (!isWorkspaceIdentifier(workspace)) {
+				console.log('not a workspace identifer');
 				return []; // wrong format, skip all entries
 			}
 
@@ -266,10 +267,12 @@ export class BackupMainService implements IBackupMainService {
 					if (workspace.configPath.scheme !== Schemas.file || await exists(workspace.configPath.fsPath)) {
 						result.push(workspace);
 					} else {
+						console.log('target workspace missing');
 						// If the workspace has backups, but the target workspace is missing, convert backups to empty ones
 						await this.convertToEmptyWindowBackup(backupPath);
 					}
 				} else {
+					console.log('no backups');
 					await this.deleteStaleBackup(backupPath);
 				}
 			}
diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
@@ -296,31 +296,23 @@ suite('BackupMainService', () => {
 
 		test('migrate storage file', async () => {
 			let folderPath = path.join(parentDir, 'f1');
+			ensureFolderExists(URI.file(folderPath));
 			const backupFolderPath = service.toLegacyBackupPath(folderPath);
-			if (!fs.existsSync(backupFolderPath)) {
-				fs.mkdirSync(backupFolderPath);
-				fs.mkdirSync(path.join(backupFolderPath, Schemas.file));
-				await pfs.writeFile(path.join(backupFolderPath, Schemas.file, 'unsaved1.txt'), 'Legacy');
-			}
+			await createBackupFolder(backupFolderPath);
 
 			let workspacePath = path.join(parentDir, 'f2.code-workspace');
 			const workspace = toWorkspace(workspacePath);
-
-			const backupWorkspacePath = service.toBackupPath(workspace.id);
-			if (!fs.existsSync(backupWorkspacePath)) {
-				fs.mkdirSync(backupWorkspacePath);
-				fs.mkdirSync(path.join(backupWorkspacePath, Schemas.file));
-				await pfs.writeFile(path.join(backupWorkspacePath, Schemas.file, 'unsaved2.txt'), 'Legacy');
-			}
-
+			await ensureWorkspaceExists(workspace);
 
 			const workspacesJson = { rootWorkspaces: [{ id: workspace.id, configPath: workspacePath }], folderWorkspaces: [folderPath], emptyWorkspaces: [] };
 			await pfs.writeFile(backupWorkspacesPath, JSON.stringify(workspacesJson));
 			await service.initialize();
 			const content = await pfs.readFile(backupWorkspacesPath, 'utf-8');
 			const json = (<IBackupWorkspacesFormat>JSON.parse(content));
 			assert.deepEqual(json.folderURIWorkspaces, [URI.file(folderPath).toString()]);
-			assert.deepEqual(json.rootURIWorkspaces, [{ id: workspace.id, configPath: URI.file(workspacePath).toString() }]);
+			assert.deepEqual(json.rootURIWorkspaces, [{ id: workspace.id, configURIPath: URI.file(workspacePath).toString() }]);
+
+			assertEqualUris(service.getWorkspaceBackups().map(w => w.configPath), [workspace.configPath]);
 		});
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,7 @@ export class BackupMainService implements IBackupMainService {`
`252`	`252`	`// Validate Workspaces`
`253`	`253`	`for (let workspace of rootWorkspaces) {`
`254`	`254`	`if (!isWorkspaceIdentifier(workspace)) {`
	`255`	`+ console.log('not a workspace identifer');`
`255`	`256`	`return []; // wrong format, skip all entries`
`256`	`257`	`}`
`257`	`258`
`@@ -266,10 +267,12 @@ export class BackupMainService implements IBackupMainService {`
`266`	`267`	`if (workspace.configPath.scheme !== Schemas.file \|\| await exists(workspace.configPath.fsPath)) {`
`267`	`268`	`result.push(workspace);`
`268`	`269`	`} else {`
	`270`	`+ console.log('target workspace missing');`
`269`	`271`	`// If the workspace has backups, but the target workspace is missing, convert backups to empty ones`
`270`	`272`	`await this.convertToEmptyWindowBackup(backupPath);`
`271`	`273`	`}`
`272`	`274`	`} else {`
	`275`	`+ console.log('no backups');`
`273`	`276`	`await this.deleteStaleBackup(backupPath);`
`274`	`277`	`}`
`275`	`278`	`}`