From 4f5e51430cd7f0d8962f19157d20fc77c607d732 Mon Sep 17 00:00:00 2001
From: blagoev <lubo@blagoev.com>
Date: Thu, 21 Sep 2017 15:40:31 +0300
Subject: [PATCH 1/2] Test 2.0.x on CI

---
 tests/js/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/js/index.js b/tests/js/index.js
index c5f98bd4..4222474a 100644
--- a/tests/js/index.js
+++ b/tests/js/index.js
@@ -47,7 +47,8 @@ if (global.enableSyncTests) {
     // FIXME: Permission tests currently fail in chrome debugging mode.
     if (typeof navigator === 'undefined' ||
       !/Chrome/.test(navigator.userAgent)) { // eslint-disable-line no-undef
-      TESTS.PermissionTests = require('./permission-tests');
+      
+     TESTS.PermissionTests = require('./permission-tests');
     }
 }
 

From 988a86ff197c8b3aabdad19824c9df3c8c7fcc1d Mon Sep 17 00:00:00 2001
From: blagoev <lubo@blagoev.com>
Date: Thu, 21 Sep 2017 16:12:43 +0300
Subject: [PATCH 2/2] ignore kill process errors

---
 scripts/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/test.sh b/scripts/test.sh
index ef7d81dc..6fb10a4a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -64,7 +64,7 @@ stop_server() {
   echo stopping server 
   if [[ ${SERVER_PID} -gt 0 ]] ; then
     echo server is running. killing it
-    kill -9 ${SERVER_PID}
+    kill -9 ${SERVER_PID} || true
   fi
 }