Skip to content

Commit

Permalink
travis CI: fix e2e tests running on linux
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimiry committed Feb 25, 2018
1 parent 4bd48bf commit e8fd4f8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion src/e2e/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
17 changes: 8 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -864,18 +864,17 @@ [email protected]:
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"
Expand Down Expand Up @@ -7816,9 +7815,9 @@ retry@^0.10.0:
version "0.10.1"
resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"

[email protected].2:
version "3.4.2"
resolved "https://registry.yarnpkg.com/rewiremock/-/rewiremock-3.4.2.tgz#bfd8ea4321a7c62ba45a475ffb0a06706b9331d0"
[email protected].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"
Expand Down

0 comments on commit e8fd4f8

Please sign in to comment.