combine back rpki tests

.travis.yml

@@ -7,18 +7,11 @@ jobs:
     - stage: "Tests"
       name: "Tests without proxy"
       script: npm run test
-    - name: "Tests rpki 1"
+    - name: "Tests rpki"
       before_script:
         - rm -f -R .cache/
       script:
-        - ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external-roas.js --require @babel/register
+        - npm run test-rpki
-        - ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.default.js --require @babel/register
-    - name: "Tests rpki 2"
-      before_script:
-        - rm -f -R .cache/
-      script:
-        - ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external.js --require @babel/register
-        - ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external-removed.js --require @babel/register
     - name: "Tests: prefix generation and reports"
       script:
         - npm run test-generate

package.json

@@ -15,7 +15,7 @@
     "test-proxy": "./node_modules/.bin/mocha --exit tests/proxy_tests/*.js --require @babel/register",
     "test-generate": "./node_modules/.bin/mocha --exit tests/generate_tests/*.js --require @babel/register",
     "test-kafka": "./node_modules/.bin/mocha --exit tests/kafka_tests/*.js --require @babel/register",
-    "test-rpki": "./node_modules/.bin/mocha --exit tests/rpki_tests/tests.default.js --require @babel/register && ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external.js --require @babel/register && ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external-removed.js --require @babel/register && rm -f -R .cache/ && ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external-roas.js --require @babel/register",
+    "test-rpki": "./node_modules/.bin/mocha --exit tests/rpki_tests/tests.default.js --require @babel/register && ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external.js --require @babel/register && rm -f -R .cache/ && ./node_modules/.bin/mocha --exit tests/rpki_tests/tests.external-roas.js --require @babel/register",
     "build": "./build.sh",
     "watch-and-serve": "nodemon -e yml,js,json,txt --inspect --exec babel-node index.js",
     "serve": "babel-node index.js",

tests/rpki_tests/tests.external-removed.js

@@ -1,110 +0,0 @@
-/*
- * 	BSD 3-Clause License
- *
- * Copyright (c) 2019, NTT Ltd.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *  Neither the name of the copyright holder nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-const chai = require("chai");
-const chaiSubset = require('chai-subset');
-const fs = require('fs');
-const expect = chai.expect;
-const asyncTimeout = 200000;
-chai.use(chaiSubset);
-
-global.EXTERNAL_CONFIG_FILE = "tests/rpki_tests/config.rpki.test.external.yml";
-
-fs.copyFileSync("tests/rpki_tests/vrp.missing.json", "tests/rpki_tests/vrp.json");
-
-const worker = require("../../index");
-const pubSub = worker.pubSub;
-
-describe("RPKI monitoring 3", function() {
-
-    it("missing roas", function (done) {
-
-        const expectedData = {
-
-            "a82_112_100_0_24-2914-null": {
-                id: 'a82_112_100_0_24-2914-null',
-                origin: 'rpki-monitor',
-                affected: '82.112.100.0/24',
-                message: 'The route 82.112.100.0/24 announced by AS2914 is no longer covered by a ROA.'
-            },
-
-            "a8_8_8_8_22-2914-null" : {
-                id: 'a8_8_8_8_22-2914-null',
-                origin: 'rpki-monitor',
-                affected: '8.8.8.8/22',
-                message: 'The route 8.8.8.8/22 announced by AS2914 is no longer covered by a ROA.'
-            },
-
-            "a103_21_244_0_24-13335-null": {
-                id: 'a103_21_244_0_24-13335-null',
-                origin: 'rpki-monitor',
-                affected: '103.21.244.0/24',
-                message: 'The route 103.21.244.0/24 announced by AS13335 is no longer covered by a ROA.'
-            }
-
-        };
-
-        let rpkiTestCompletedExternal = false;
-        pubSub.subscribe("rpki", function (type, message) {
-
-            if (!rpkiTestCompletedExternal) {
-                message = JSON.parse(JSON.stringify(message));
-                const id = message.id;
-
-                expect(Object.keys(expectedData).includes(id)).to.equal(true);
-                expect(expectedData[id] != null).to.equal(true);
-
-                expect(message).to.containSubset(expectedData[id]);
-
-                expect(message).to.contain
-                    .keys([
-                        "latest",
-                        "earliest"
-                    ]);
-
-                delete expectedData[id];
-                if (Object.keys(expectedData).length === 0) {
-                    setTimeout(() => {
-                        rpkiTestCompletedExternal = true;
-                        fs.unlinkSync("tests/rpki_tests/vrp.json");
-                        done();
-                    }, 5000);
-                }
-            }
-        });
-
-        setTimeout(() => { // Wait that the watcher realizes the file changed
-            pubSub.publish("test-type", "rpki");
-        }, 8000);
-
-    }).timeout(asyncTimeout);
-});

tests/rpki_tests/tests.external-roas.js

@@ -50,7 +50,7 @@ setTimeout(() => {
 const worker = require("../../index");
 const pubSub = worker.pubSub;
 
-describe("RPKI monitoring 4", function() {
+describe("RPKI monitoring 3", function() {
 
     it("ROA diff - external connector", function (done) {
 

tests/rpki_tests/tests.external.js

@@ -96,4 +96,68 @@ describe("RPKI monitoring 2", function() {
         }, 16000);
 
     }).timeout(asyncTimeout);
+
+    it("missing roas", function (done) {
+
+        const expectedData = {
+
+            "a82_112_100_0_24-2914-null": {
+                id: 'a82_112_100_0_24-2914-null',
+                origin: 'rpki-monitor',
+                affected: '82.112.100.0/24',
+                message: 'The route 82.112.100.0/24 announced by AS2914 is no longer covered by a ROA.'
+            },
+
+            "a8_8_8_8_22-2914-null" : {
+                id: 'a8_8_8_8_22-2914-null',
+                origin: 'rpki-monitor',
+                affected: '8.8.8.8/22',
+                message: 'The route 8.8.8.8/22 announced by AS2914 is no longer covered by a ROA.'
+            },
+
+            "a103_21_244_0_24-13335-null": {
+                id: 'a103_21_244_0_24-13335-null',
+                origin: 'rpki-monitor',
+                affected: '103.21.244.0/24',
+                message: 'The route 103.21.244.0/24 announced by AS13335 is no longer covered by a ROA.'
+            }
+
+        };
+
+        fs.copyFileSync("tests/rpki_tests/vrp.missing.json", "tests/rpki_tests/vrp.json");
+
+        let rpkiTestCompletedExternal = false;
+        pubSub.subscribe("rpki", function (type, message) {
+
+            if (!rpkiTestCompletedExternal) {
+                message = JSON.parse(JSON.stringify(message));
+                const id = message.id;
+
+                expect(Object.keys(expectedData).includes(id)).to.equal(true);
+                expect(expectedData[id] != null).to.equal(true);
+
+                expect(message).to.containSubset(expectedData[id]);
+
+                expect(message).to.contain
+                    .keys([
+                        "latest",
+                        "earliest"
+                    ]);
+
+                delete expectedData[id];
+                if (Object.keys(expectedData).length === 0) {
+                    setTimeout(() => {
+                        rpkiTestCompletedExternal = true;
+                        fs.unlinkSync("tests/rpki_tests/vrp.json");
+                        done();
+                    }, 5000);
+                }
+            }
+        });
+
+        setTimeout(() => { // Wait that the watcher realizes the file changed
+            pubSub.publish("test-type", "rpki");
+        }, 8000);
+
+    }).timeout(asyncTimeout);
 });