Merge pull request #321 from snyk/amir/ohgod

Amir/ohgod

Author: Amir Moualem

test/integration/kubernetes.test.ts

@@ -13,20 +13,10 @@ import * as kubectl from '../helpers/kubectl';
 
 let integrationId: string;
 
-async function tearDown() {
+tap.tearDown(async() => {
   console.log('Begin removing the snyk-monitor...');
   await setup.removeMonitor();
   console.log('Removed the snyk-monitor!');
-}
-
-tap.tearDown(tearDown);
-
-tap.test('start with clean environment', async () => {
-  try {
-    await tearDown();
-  } catch (error) {
-    console.log(`could not start with a clean environment: ${error.message}`);
-  }
 });
 
 // Make sure this runs first -- deploying the monitor for the next tests

test/integration/package-manager.test.ts

@@ -19,13 +19,11 @@ if (!packageManager) {
   throw new Error('Missing PACKAGE_MANAGER environment variable');
 }
 
-async function tearDown() {
+tap.tearDown(async () => {
   console.log('Begin removing the snyk-monitor...');
   await removeMonitor();
   console.log('Removed the snyk-monitor!');
-}
-
-tap.tearDown(tearDown);
+});
 
 // Make sure this runs first -- deploying the monitor for the next tests
 tap.test('deploy snyk-monitor', async (t) => {

test/setup/index.ts

@@ -1,4 +1,4 @@
-import { readFileSync, unlinkSync, writeFileSync } from 'fs';
+import { readFileSync, writeFileSync } from 'fs';
 import * as sleep from 'sleep-promise';
 import * as uuidv4 from 'uuid/v4';
 import { parse, stringify } from 'yaml';
@@ -67,16 +67,6 @@ export async function removeMonitor(): Promise<void> {
   } catch (error) {
     console.log(`Could not remove the Kubernetes-Monitor: ${error.message}`);
   }
-
-  console.log('Removing KUBECONFIG environment variable...');
-  delete process.env.KUBECONFIG;
-
-  console.log('Removing test YAML file...');
-  try {
-    unlinkSync('snyk-monitor-test-deployment.yaml');
-  } catch (error) {
-    console.log(`Could not delete the test YAML file: ${error.message}`);
-  }
 }
 
 async function createEnvironment(): Promise<void> {
@@ -145,9 +135,12 @@ export async function deployMonitor(): Promise<string> {
     await kubectl.downloadKubectl();
     if (createCluster) {
       await platforms[testPlatform].create();
+      await platforms[testPlatform].config();
+    } else {
+      await platforms[testPlatform].config();
+      await platforms[testPlatform].clean();
     }
     const remoteImageName = await platforms[testPlatform].loadImage(imageNameAndTag);
-    await platforms[testPlatform].config();
     await createEnvironment();
     await createSecretForGcrIoAccess();