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.

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

Adding selendroid/appium support #20

Merged
merged 16 commits into from
Nov 20, 2017
Merged
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
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ ENV/
logs/*.log.*

# QAlab
qalab/configs/settings.hub.json
qalab/configs/settings.node.json
qalab/drivers/selenium-server-standalone-3.5.3.jar
qalab/configs/*.hub.json
qalab/configs/*.node.json
qalab/drivers/selenium-server-standalone-*.jar
qalab/drivers/selendroid-standalone-*.jar
qalab/drivers/selendroid-grid-plugin-*.jar
qalab/apks/*.apk
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@ before_install:
- python setup.py build
- python setup.py install
install:
- python qalab/qalab.py selenium -m hub -i
- python qalab/qalab.py selenium -m node -i
- python qalab/qalab.py -sd selenium -m hub -i
- python qalab/qalab.py -sd selenium -m node -i
- python qalab/qalab.py -sd selendroid -m hub -i
- python qalab/qalab.py -sd selendroid -m node -i
- python qalab/qalab.py -sd appium -m node -i
before_script:
- python qalab/qalab.py selenium -m hub -s -p lin64 &
- python qalab/qalab.py selenium -m node -s -p lin64 &
- python qalab/qalab.py -sd selenium -m hub -s -p lin64 &
- python qalab/qalab.py -sd selenium -m node -s -p lin64 &
script:
- sleep 10
- nc -z -v -w5 localhost 11000
Expand Down
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ environment:

install:
- "%PYTHON%\\python.exe setup.py install"
- "%PYTHON%\\python.exe qalab\\qalab.py selenium -m hub -i"
- "%PYTHON%\\python.exe qalab\\qalab.py selenium -m node -i"
- "%PYTHON%\\python.exe qalab\\qalab.py -sd selenium -m hub -i"
- "%PYTHON%\\python.exe qalab\\qalab.py -sd selenium -m node -i"
- "%PYTHON%\\python.exe qalab\\qalab.py -sd selendroid -m hub -i"
- "%PYTHON%\\python.exe qalab\\qalab.py -sd selendroid -m node -i"
- "%PYTHON%\\python.exe qalab\\qalab.py -sd appium -m node -i"

test_script:
- echo "BUILD SUCCESS"
Expand Down
2 changes: 1 addition & 1 deletion modules/qacode
Submodule qacode updated 0 files
2 changes: 1 addition & 1 deletion modules/qadoc
Submodule qadoc updated 0 files
Empty file added qalab/apks/__init__.py
Empty file.
29 changes: 29 additions & 0 deletions qalab/configs/appium.node.example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"capabilities": [
{
"platform": "ANDROID",
"version": "6.0",
"maxInstances": 1,
"noSign":true,
"automationName": "Appium",
"browserName": "",
"platformName": "Android",
"platformVersion": "6.0",
"deviceName": "qa-tablet-nexus10",
"orientation": "LANDSCAPE",
"app": "qalab/apks/selendroid-test-app-0.17.0.apk"
}
],
"configuration": {
"cleanUpCycle": 2000,
"timeout": 30000,
"url": "http://localhost:4723/wd/hub",
"host": "localhost",
"port": 4723,
"maxSession": 1,
"register": true,
"registerCycle": 5000,
"hubPort": 11000,
"hubHost": "localhost"
}
}
Binary file added qalab/configs/debug.keystore
Binary file not shown.
13 changes: 13 additions & 0 deletions qalab/configs/selendroid.hub.example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"host": "localhost",
"port": 12000,
"newSessionWaitTimeout": -1,
"servlets" : [],
"prioritizer": null,
"capabilityMatcher": "io.selendroid.grid.SelendroidCapabilityMatcher",
"throwOnCapabilityNotPresent": true,
"nodePolling": 5000,
"cleanUpCycle": 5000,
"browserTimeout": 0,
"jettyMaxThreads":-1
}
18 changes: 18 additions & 0 deletions qalab/configs/selendroid.node.example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"capabilities": [{
"browserName": "selendroid",
"maxInstances": 1,
"aut": "io.selendroid.testapp:0.17.0"
}, {
"browserName": "android",
"maxInstances": 1
}],
"configuration": {
"maxSession": 1,
"register": true,
"hubHost": "localhost",
"hubPort": 12001,
"remoteHost": "http://localhost:12000",
"proxy": "io.selendroid.grid.SelendroidSessionProxy"
}
}
25 changes: 0 additions & 25 deletions qalab/configs/settings.appium.example.json

This file was deleted.

Loading