make failing tests more linear in a parallel world

Author: glasnt

compute/test/createInstanceReplicatedBootDisk.test.js

@@ -118,28 +118,16 @@ describe('Create compute instance with replicated boot disk', async () => {
   let projectId;
   let diskSnapshotLink;
 
-  before(async () => {
+  it('should create an instance with replicated boot disk', async () => {
+
+    // before
     const instancesClient = new computeLib.InstancesClient();
     projectId = await instancesClient.getProjectId();
     diskSnapshotLink = `projects/${projectId}/global/snapshots/${snapshotName}`;
 
     await createDisk(projectId, zone1, diskName);
     await createDiskSnapshot(projectId, zone1, diskName, snapshotName);
-  });
 
-  after(async () => {
-    // Cleanup resources
-    const instances = await getStaleVMInstances();
-    await Promise.all(
-      instances.map(instance =>
-        deleteInstance(instance.zone, instance.instanceName)
-      )
-    );
-    await deleteDiskSnapshot(projectId, snapshotName);
-    await deleteDisk(projectId, zone1, diskName);
-  });
-
-  it('should create an instance with replicated boot disk', () => {
     const response = execSync(
       `node ./instances/create-start-instance/createInstanceReplicatedBootDisk.js ${zone1} ${zone2} ${vmName} ${diskSnapshotLink}`,
       {
@@ -152,5 +140,15 @@ describe('Create compute instance with replicated boot disk', async () => {
         `Instance: ${vmName} with replicated boot disk created.`
       )
     );
+
+    // after Cleanup resources
+    const instances = await getStaleVMInstances();
+    await Promise.all(
+      instances.map(instance =>
+        deleteInstance(instance.zone, instance.instanceName)
+      )
+    );
+    await deleteDiskSnapshot(projectId, snapshotName);
+    await deleteDisk(projectId, zone1, diskName);
   });
 });

compute/test/replicatedDisk.test.js

@@ -57,20 +57,11 @@ describe('Create compute regional replicated disk', async () => {
   const zone2 = `${region}-b`;
   let projectId;
 
-  before(async () => {
+
+  it('should create a regional replicated disk and attach to vm', async () => {
     const instancesClient = new computeLib.InstancesClient();
     projectId = await instancesClient.getProjectId();
-  });
-
-  after(async () => {
-    // Cleanup resources
-    execSync(`node ./deleteInstance.js ${projectId} ${zone1} ${vmName}`, {
-      cwd,
-    });
-    await deleteDisk(projectId, region, diskName);
-  });
 
-  it('should create a regional replicated disk', () => {
     const response = execSync(
       `node ./disks/createRegionalReplicatedDisk.js ${diskName} ${region} ${zone1} ${zone2}`,
       {
@@ -79,9 +70,7 @@ describe('Create compute regional replicated disk', async () => {
     );
 
     assert(response.includes(`Regional replicated disk: ${diskName} created.`));
-  });
 
-  it('should attach replicated disk to vm', () => {
     // Create VM, where replicated disk will be attached.
     execSync(
       `node ./createInstance.js ${projectId} ${zone1} ${vmName} e2-small`,
@@ -90,17 +79,23 @@ describe('Create compute regional replicated disk', async () => {
       }
     );
 
-    const response = execSync(
+    const responseAttach = execSync(
       `node ./disks/attachRegionalDisk.js ${diskName} ${region} ${vmName} ${zone1}`,
       {
         cwd,
       }
     );
 
     assert(
-      response.includes(
+      responseAttach.includes(
         `Replicated disk: ${diskName} attached to VM: ${vmName}.`
       )
     );
+
+    // Cleanup resources
+    execSync(`node ./deleteInstance.js ${projectId} ${zone1} ${vmName}`, {
+      cwd,
+    });
+    await deleteDisk(projectId, region, diskName);
   });
 });