From e8fd4f8f474c2a045941ed50cbd13ead9af09461 Mon Sep 17 00:00:00 2001
From: Vladimir Y <dev.vladimir.y@gmail.com>
Date: Sun, 25 Feb 2018 10:05:47 +0100
Subject: [PATCH] travis CI: fix e2e tests running on linux

---
 .travis.yml     |  4 +++-
 package.json    |  4 ++--
 src/e2e/util.ts |  6 +++++-
 yarn.lock       | 17 ++++++++---------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e880e604f..2dfe43fb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ matrix:
 env:
   global:
     - CI=true
+    - NO_AT_BRIDGE=1
     - ELECTRON_CACHE=$HOME/.cache/electron
     - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
     - FAILURE_ARCHIVE_FILE=travis-build-id-$TRAVIS_BUILD_ID.tar.gz
@@ -42,9 +43,10 @@ before_script:
   - |
     if [ "$TRAVIS_OS_NAME" == "linux" ]; then
       export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3;
+      eval $(dbus-launch --sh-syntax);
       eval $(echo -n "" | /usr/bin/gnome-keyring-daemon --login);
       eval $(/usr/bin/gnome-keyring-daemon --components=secrets --start);
-      dbus-launch /usr/bin/python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');"
+      /usr/bin/python -c "import gnomekeyring;gnomekeyring.create_sync('login', '');";
     fi
 script: ./scripts/travis.sh
 after_failure:
diff --git a/package.json b/package.json
index a787ff74b..43c2befe1 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "autoprefixer": "8.0.0",
     "ava": "0.25.0",
     "ava-ts": "0.24.2",
-    "awesome-typescript-loader": "3.4.1",
+    "awesome-typescript-loader": "3.5.0",
     "bootstrap": "4.0.0",
     "circular-dependency-plugin": "4.4.0",
     "codelyzer": "4.1.0",
@@ -148,7 +148,7 @@
     "randomstring": "1.1.5",
     "raw-loader": "0.5.1",
     "resolve-url-loader": "2.2.1",
-    "rewiremock": "3.4.2",
+    "rewiremock": "3.4.3",
     "rxjs-tslint-rules": "3.14.0",
     "sass-lint": "1.12.1",
     "sass-loader": "6.0.6",
diff --git a/src/e2e/util.ts b/src/e2e/util.ts
index ccba8bcaa..476890a53 100644
--- a/src/e2e/util.ts
+++ b/src/e2e/util.ts
@@ -175,7 +175,11 @@ export const actions = {
                 ];
 
                 for (const {PID} of processesToKill) {
-                    process.kill(Number(PID), "SIGKILL");
+                    try {
+                        process.kill(Number(PID), "SIGKILL");
+                    } catch {
+                        // NOOP
+                    }
                 }
             })();
         } catch (error) {
diff --git a/yarn.lock b/yarn.lock
index 915dab974..b74e8382f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -864,18 +864,17 @@ ava@0.25.0:
     unique-temp-dir "^1.0.0"
     update-notifier "^2.3.0"
 
-awesome-typescript-loader@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.4.1.tgz#22fa49800f0619ec18ab15383aef93b95378dea9"
+awesome-typescript-loader@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-3.5.0.tgz#4d4d10cba7a04ed433dfa0334250846fb11a1a5a"
   dependencies:
-    colors "^1.1.2"
+    chalk "^2.3.1"
     enhanced-resolve "3.3.0"
     loader-utils "^1.1.0"
     lodash "^4.17.4"
     micromatch "^3.0.3"
     mkdirp "^0.5.1"
-    object-assign "^4.1.1"
-    source-map-support "^0.4.15"
+    source-map-support "^0.5.3"
 
 aws-sign2@~0.6.0:
   version "0.6.0"
@@ -7816,9 +7815,9 @@ retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
-rewiremock@3.4.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/rewiremock/-/rewiremock-3.4.2.tgz#bfd8ea4321a7c62ba45a475ffb0a06706b9331d0"
+rewiremock@3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/rewiremock/-/rewiremock-3.4.3.tgz#84b887437bf8944ccb3d61f6039db4aa0f64bbec"
   dependencies:
     compare-module-exports "^2.0.0"
     lodash.some "^4.6.0"