Merge pull request #1333 from realm/test-2.0.x

fix build for 2.0.x

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
 }
 

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');
     }
 }