Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ before_script:
- "sh -e /etc/init.d/xvfb start"
script:
- "firefox --version"
- "python test/run_tests.py python $BROWSER --noncritical known_issue_-_travisci"
- "python test/run_tests.py python $BROWSER"
env:
matrix:
- BROWSER=firefox
#- BROWSER=ie # will be added when we have completed SauceLabs CI
#- BROWSER=safari # will be added after #247 merged
- BROWSER=ie # will be added when we have completed SauceLabs CI
- BROWSER=safari # will be added after #247 merged
global:
- secure: JL3yH6vGVspkmKmXXmKLFXElam1SM3MBKD92CohdJA31WERVWjIJex1veOUKCPVqEBI+H+tXa93LQ8qy+/Ewm/p9XNUc+XUwuLArlgxKlG4k9pFPJr1uUUF8F9CYsP7m7PcPFO4hkn/Kzpq5wxFFMfLM7vXwaqpQSzxJqNxBEQE=
- secure: Ko4lJSVDhkoS9mjIp4TgQnExTCoW+56/6EgYzxx1fwFgmMMVkxIH09Q0bJRgZhA2xbF/xP9jMAKZXGIaKbbxjagkqYc9AhuaCiF7vUohqZV6I6bpZmtKWIuWgC8Gnx6hwVn5bU7t444y789TmLp0cZlGCNiVfBwriveNGNvBxw0=
addons:
sauce_connect: true
8 changes: 8 additions & 0 deletions test/acceptance/resource.robot
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Library OperatingSystem
${SERVER} localhost:7000
${BROWSER} firefox
${REMOTE_URL} ${NONE}
${TUNNEL_IDENTIFIER} ${NONE}
${DESIRED_CAPABILITIES} ${NONE}
${ROOT} http://${SERVER}/html
${FRONT PAGE} ${ROOT}/
Expand All @@ -22,6 +23,7 @@ Open Browser To Start Page

Open Browser To Start Page Without Testing Default Options
[Documentation] Open Browser To Start Page Without Testing Default Options
Set Desired Capabilities
Open Browser ${FRONT PAGE} ${BROWSER} remote_url=${REMOTE_URL}
... desired_capabilities=${DESIRED_CAPABILITIES}
${orig speed} = Set Selenium Speed ${SPEED}
Expand All @@ -32,6 +34,7 @@ Open Browser To Start Page And Test Implicit Wait
[Arguments] ${implicit_wait}
[Documentation] This keyword tests that 'Set Selenium Implicit Wait' and
... 'Get Selenium Implicit Wait' work as expected
Set Desired Capabilities
Should Not Be Equal 0 ${implicit_wait}
... Please do not pass in a value of 0 for the implicit wait argument for this function
${old_wait}= Set Selenium Implicit Wait ${implicit_wait}
Expand Down Expand Up @@ -70,3 +73,8 @@ Set ${level} Loglevel
Verify Location Is "${relative url}"
[Documentation] Verifies location
Location Should Be ${ROOT}/${relative url}

Set Desired Capabilities
[Documentation] Builds the DESIRED_CAPABILITIES dictionary
${capabilities}= Create Dictionary tunnel-identifier=${TUNNEL_IDENTIFIER}
Set Global Variable ${DESIRED_CAPABILITIES} ${capabilities}
4 changes: 4 additions & 0 deletions test/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
RESULTS_DIR = os.path.join(ROOT_DIR, "results")
HTTP_SERVER_FILE = os.path.join(RESOURCES_DIR, 'testserver', 'testserver.py')
SRC_DIR = os.path.join(ROOT_DIR, "..", "src")
TRAVIS = os.environ.get('TRAVIS')
TRAVIS_JOB_NUMBER = os.environ.get('TRAVIS_JOB_NUMBER')
SAUCE_USERNAME = os.environ.get('SAUCE_USERNAME')
SAUCE_ACCESS_KEY = os.environ.get('SAUCE_ACCESS_KEY')

sys.path.insert(0, SRC_DIR)
sys.path.append(LIB_DIR)
Expand Down
9 changes: 9 additions & 0 deletions test/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
'--outputdir', '%(outdir)s',
'--variable', 'browser:%(browser)s',
'--variable', 'pyversion:%(pyVersion)s',
'--variable', 'SAUCE_USERNAME:%(sauceUserName)s',
'--variable', 'SAUCE_ACCESS_KEY:%(sauceAccessKey)s',
'--escape', 'space:SP',
'--report', 'none',
'--log', 'none',
Expand All @@ -36,6 +38,13 @@
def acceptance_tests(interpreter, browser, args):
ARG_VALUES['browser'] = browser.replace('*', '')
ARG_VALUES['pyVersion'] = interpreter + sys.version[:3]
ARG_VALUES['sauceUserName'] = env.SAUCE_USERNAME
ARG_VALUES['sauceAccessKey'] = env.SAUCE_ACCESS_KEY
ARG_VALUES['travisJobNumber'] = env.TRAVIS_JOB_NUMBER
if env.TRAVIS:
ROBOT_ARGS.extend(['--noncritical', 'known_issue_-_travisci'])
ROBOT_ARGS.extend(['--variable', 'REMOTE_URL:http://%(sauceUserName)s:%(sauceAccessKey)s@ondemand.saucelabs.com:80/wd/hub'])
ROBOT_ARGS.extend(['--variable', 'TUNNEL_IDENTIFIER:%(travisJobNumber)s'])
start_http_server()
runner = {'python': 'pybot', 'jython': 'jybot', 'ipy': 'ipybot'}[interpreter]
if os.sep == '\\':
Expand Down