Skip to content

Commit

Permalink
gtri#2: more chromedriver shenanigans, fix conda invocation
Browse files Browse the repository at this point in the history
  • Loading branch information
bollwyvl committed Feb 2, 2019
1 parent 6c6822c commit 0095134
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
7 changes: 4 additions & 3 deletions ci/steps.conda.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ steps:
pylint
pytest
pytest-cov
python-chromedriver-binary
python-chromedriver-binary==2.42
robotframework-lint
robotframework-seleniumlibrary>=3.2.0
robotframework>=3.1
selenium>=3.141.0
twine
- script: conda remove -yf zeromq pyzmq && pip install pyzmq
- script: conda remove -f zeromq pyzmq && pip install pyzmq
displayName: zmq hack
- ${{ if not(eq(parameters.name, 'Windows')) }}:
- task: CondaEnvironment@1
Expand All @@ -50,8 +50,9 @@ steps:
pylint
pytest
pytest-cov
python-chromedriver-binary
python-chromedriver-binary>=2.45
robotframework-lint
robotframework-seleniumlibrary>=3.2.0
robotframework>=3.1
selenium>=3.141.0
twine
10 changes: 9 additions & 1 deletion scripts/test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (c) 2018 Georgia Tech Research Corporation
# Distributed under the terms of the BSD-3-Clause License

import os
import sys

import chromedriver_binary # noqa
Expand All @@ -17,6 +18,13 @@ def unit_tests(*pytest_args):


def acceptance_tests(*robot_args):
env = dict(**os.environ)
env.update(
PATH=os.pathsep.join(
[os.path.dirname(chromedriver_binary.__file__), os.environ["PATH"]]
)
)

args = (
[
sys.executable,
Expand All @@ -40,7 +48,7 @@ def acceptance_tests(*robot_args):
+ list(robot_args)
+ [str(TEST_DIR)]
)
return run(args)
return run(args, env=env)


if __name__ == "__main__":
Expand Down

0 comments on commit 0095134

Please sign in to comment.