Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix running headed chrome tests with proxy. #755

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Fix running headed chrome tests with proxy. #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ before_install:
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x24"
- CACHE="${HOME}/cache" CMAKE_VERSION=3.5.0 CMAKE_SHORT_VERSION=3.5 source ./scripts/install_cmake.sh
- npm prune
- npm install -g npm

before_script:
- export DISPLAY=:99.0
Expand All @@ -55,8 +56,8 @@ script:
after_failure:
# Upload test results. First make them smaller with optipng.
- pip install --user --upgrade girder-client requests[security]
- find _build/images -name '*-test.png' | xargs optipng
- find _build/images -name '*-test.png' | xargs python scripts/upload_test_images.py
- find _build/images -name '*-test.png' -exec optipng {} \+
- find _build/images -name '*-test.png' -exec python scripts/upload_test_images.py {} \+

after_success:
- npm run codecov
Expand Down
11 changes: 10 additions & 1 deletion karma-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,17 @@ module.exports = function (config) {
]
},
ChromeWithProxy: {
base: 'ChromeFull',
// inheriting from ChromeFull ignores the flags in this entry, so we
// need to inherit from Chrome
base: 'Chrome',
flags: [
'--no-sandbox', // necessary to run tests in a docker
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbeezley could you review the karma conf?

'--no-pings', // no auditing pings
'--device-scale-factor=1',
'--window-position=0,0',
'--start-fullscreen',
'--kiosk',
'--incognito',
'--proxy-pac-url=' + config.protocol + '//' + config.hostname + ':' + config.port + '/testdata/proxy-for-tests.pac'
]
},
Expand Down
Loading