Removed await timeout in tests

Author: edgardmessias

src/test/repository.test.ts

@@ -17,7 +17,6 @@ import { Svn } from "../svn";
 import { Model } from "../model";
 import { SvnFinder, ISvn } from "../svnFinder";
 import { Repository } from "../repository";
-import { timeout } from "../util";
 
 // Defines a Mocha test suite to group tests of similar kind together
 suite("Repository Tests", () => {
@@ -29,6 +28,8 @@ suite("Repository Tests", () => {
   let model: Model;
 
   suiteSetup(async () => {
+    await testUtil.activeExtension();
+
     repoUri = await testUtil.createRepoServer();
     await testUtil.createStandardLayout(testUtil.getSvnUrl(repoUri));
     checkoutDir = await testUtil.createRepoCheckout(
@@ -103,15 +104,13 @@ suite("Repository Tests", () => {
 
     await repository.addFiles([file]);
 
-    await timeout(1500); // Wait the debounce time
     assert.equal(repository.changes.resourceStates.length, 1);
 
     const message = await repository.commitFiles("First Commit", [
       file
     ]);
     assert.ok(/Committed revision (.*)\./i.test(message));
 
-    await timeout(1500); // Wait the debounce time
     assert.equal(repository.changes.resourceStates.length, 0);
 
     const remoteContent = await repository.show(file, "HEAD");

src/test/testUtil.ts

@@ -2,7 +2,7 @@ import * as cp from "child_process";
 import * as path from "path";
 import * as fs from "fs";
 import * as os from "os";
-import { Uri } from "vscode";
+import { Uri, extensions } from "vscode";
 import { SpawnOptions, ChildProcess } from "child_process";
 import { timeout } from "../util";
 
@@ -161,3 +161,19 @@ export function destroyAllTempPaths() {
     destroyPath(path);
   }
 }
+
+export function activeExtension() {
+  return new Promise<void>((resolve, reject) => {
+    const extension = extensions.getExtension("johnstoncode.svn-scm");
+    if (!extension) {
+      reject();
+      return;
+    }
+
+    if (!extension.isActive) {
+      extension.activate().then(() => resolve(), () => reject());
+    } else {
+      resolve();
+    }
+  });
+}