From f44d700c11a76fa7065c7336d7b14e24014c2912 Mon Sep 17 00:00:00 2001
From: Franck R <franck@status.im>
Date: Thu, 27 Jan 2022 21:50:27 +1100
Subject: [PATCH] Do not run bootstrap live data test as part of normal CI
 (#450)

---
 .github/workflows/ci.yml      | 39 -----------------------------------
 package.json                  |  1 -
 src/lib/discovery/dns.spec.ts |  2 +-
 src/lib/waku.node.spec.ts     | 18 +++++++++++++++-
 4 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c6f5226e2..b0a6e7f7e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -89,42 +89,3 @@ jobs:
         with:
           name: nim-waku-logs
           path: log/
-
-  # Run tests that use live data or depend on external systems
-  # This should not be mandatory as part of the PR process to not have
-  # a blocker because said external system is down.
-  build_and_test_live_data:
-    strategy:
-      matrix:
-        node: [16]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2.3.3
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: Cache npm cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: node-${{ matrix.os }}-${{ matrix.node }}-v1-${{ hashFiles('**/package-lock.json') }}
-
-      - name: install using npm ci
-        uses: bahmutov/npm-install@v1
-
-      - name: karma live data tests
-        env:
-          DEBUG: "waku:test*"
-        run: npm run test:karma-live-data
-
-      - name: Upload logs on failure
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: nim-waku-logs
-          path: log/
diff --git a/package.json b/package.json
index b71d002b03..bb3b17c20d 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,6 @@
     "test:spelling": "cspell \"{README.md,.github/*.md,guides/*.md,src/**/*.ts}\"",
     "test:unit": "nyc --silent mocha",
     "test:karma": "karma start",
-    "test:karma-live-data": "LIVE_DATA_TESTS=true karma start ./karma-live-data.conf.js",
     "examples:test": "run-s examples:pretest; for d in examples/*/; do (cd $d && npm test;); done",
     "proto": "run-s proto:*",
     "proto:lint": "buf lint",
diff --git a/src/lib/discovery/dns.spec.ts b/src/lib/discovery/dns.spec.ts
index cbabe0e522..ef3eda5283 100644
--- a/src/lib/discovery/dns.spec.ts
+++ b/src/lib/discovery/dns.spec.ts
@@ -176,7 +176,7 @@ describe('DNS Node Discovery [live data]', function () {
   const maxQuantity = 3;
 
   before(function () {
-    if (process.env.CI && !process.env.LIVE_DATA_TESTS) {
+    if (process.env.CI) {
       this.skip();
     }
   });
diff --git a/src/lib/waku.node.spec.ts b/src/lib/waku.node.spec.ts
index 5421ed9f83..50b47d44de 100644
--- a/src/lib/waku.node.spec.ts
+++ b/src/lib/waku.node.spec.ts
@@ -63,7 +63,7 @@ describe('Waku Dial [node only]', function () {
     });
   });
 
-  describe('Bootstrap', function () {
+  describe('Bootstrap [live data]', function () {
     let waku: Waku;
     let nimWaku: NimWaku;
 
@@ -72,6 +72,12 @@ describe('Waku Dial [node only]', function () {
       waku ? await waku.stop() : null;
     });
 
+    before(function () {
+      if (process.env.CI) {
+        this.skip();
+      }
+    });
+
     it('Enabling default [live data]', async function () {
       // This test depends on fleets.status.im being online.
       // This dependence must be removed once DNS discovery is implemented
@@ -90,6 +96,16 @@ describe('Waku Dial [node only]', function () {
 
       expect(connectedPeerID).to.not.be.undefined;
     });
+  });
+
+  describe('Bootstrap', function () {
+    let waku: Waku;
+    let nimWaku: NimWaku;
+
+    afterEach(async function () {
+      nimWaku ? nimWaku.stop() : null;
+      waku ? await waku.stop() : null;
+    });
 
     it('Passing an array', async function () {
       this.timeout(10_000);