Skip to content

Additional data file upload support and some comment fixing #2

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

Merged
srautiai merged 5 commits into from
Nov 14, 2014
Merged

Additional data file upload support and some comment fixing #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdc8f43
Clean and fix comments, no logical changes
spedepekka Nov 13, 2014
10f8479
Additional data file upload support
spedepekka Nov 13, 2014
ef121a4
Bump version from 0.1.2 to 0.1.3
spedepekka Nov 13, 2014
1099ccd
Add CHANGELOG
spedepekka Nov 13, 2014
0f7936b
Add missing parameter to help
spedepekka Nov 13, 2014
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
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

0.1.3
* Support additional data zip upload

2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from setuptools import setup, find_packages
import sys, os

version = '0.1.2'
version = '0.1.3'

setup(name='testdroid',
version=version,
Expand Down
32 changes: 23 additions & 9 deletions testdroid/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from datetime import datetime

FORMAT = '%(message)s'
__version__ = '0.1.2'
__version__ = '0.1.3'
logging.basicConfig(format=FORMAT)
logger = logging.getLogger('testdroid')
logger.setLevel(logging.INFO)
Expand Down Expand Up @@ -119,7 +119,7 @@ def get_token(self):
headers = { "Accept": "application/json" }
)
if res.status_code != 200:
print "FAILED: Authentication or connection failure. Check Cloud url and your credentials"
print "FAILED: Authentication or connection failure. Check Testdroid Cloud URL and your credentials."
sys.exit(-1)

reply = res.json()
Expand Down Expand Up @@ -222,6 +222,8 @@ def delete(self, path=None, payload=None, headers={}):
def get_me(self):
return self.get("me")

""" Returns list of device groups
"""
def get_device_groups(self):
return self.get("me/device-groups")

Expand All @@ -230,11 +232,12 @@ def get_device_groups(self):
def get_devices(self, limit=0):
return self.get("devices?limit=%s" % (limit))

""" Print device groups
"""
def print_device_groups(self):
for device_group in self.get_device_groups()['data']:
print "%s %s %s %s devices" % (str(device_group['id']).ljust(12), device_group['displayName'].ljust(30), device_group['osType'].ljust(10), device_group['deviceCount'])


""" Create a project
"""
def create_project(self, project_name, project_type):
Expand All @@ -243,6 +246,8 @@ def create_project(self, project_name, project_type):

logger.info("Project %s: %s (%s) created" % (project['id'], project['name'], project['type'] ))

""" Delete a project
"""
def delete_project(self, project_id):
project = self.get_project(project_id)
if project:
Expand All @@ -253,7 +258,7 @@ def delete_project(self, project_id):
def get_projects(self):
return self.get("me/projects")

""" Returns one single project
""" Returns a single project
"""
def get_project(self, project_id):
return self.get("me/projects/%s" % project_id)
Expand Down Expand Up @@ -281,6 +286,13 @@ def upload_test_file(self, project_id, filename):
path = "users/%s/projects/%s/files/test" % (me['id'], project_id)
self.upload(path=path, filename=filename)

""" Upload additional data file to project
"""
def upload_data_file(self, project_id, filename):
me = self.get_me()
path = "users/%s/projects/%s/files/data" % (me['id'], project_id)
self.upload(path=path, filename=filename)

""" Set project parameters
"""
def set_project_parameters(self, project_id, parameters):
Expand All @@ -300,8 +312,8 @@ def start_test_run(self, project_id, device_group_id=None, device_model_ids=None
sys.exit(1)

if device_group_id is None and device_model_ids is None:
print "Device group or Device models must be defined"
sys.exit(1)
print "Device group or device models must be defined"
sys.exit(1)

if device_group_id is not None:
device_group = self.get("/users/%s/device-groups/%s" % (me['id'], device_group_id))
Expand Down Expand Up @@ -332,12 +344,11 @@ def start_device_session(self, device_model_id):
payload={'deviceModelId':device_model_id}
return self.post("me/device-sessions", payload)

""" Stop device sessions
""" Stop device session
"""
def stop_device_session(self, device_session_id):
return self.post("me/device-sessions/%s/release" % (device_session_id))


""" Get all test runs for a project
"""
def get_project_test_runs(self, project_id, limit=20):
Expand Down Expand Up @@ -409,15 +420,17 @@ def format_epilog(self, formatter):
APPIUM_ANDROID
APPIUM_IOS
CALABASH
CALABASH_IOS
delete-project <id> Delete a project
projects Get projects
upload-application <project-id> <filename> Upload application to project
upload-test <project-id> <filename> Upload test file to project
upload-data <project-id> <filename> Upload additional data file to project
start-test-run <project-id> <device-group-id> Start a test run
test-runs <project-id> Get test runs for a project
test-run <project-id> <test-run-id> Get test run details
device-runs <project-id> <test-run-id> Get device runs for a test run
download-test-run <id> Download test run data. Data will be downloaded to
download-test-run <project-id> <test-run-id> Download test run data. Data will be downloaded to
current directory in a structure:
[test-run-id]/[device-run-id]-[device-name]/files...
"""
Expand All @@ -443,6 +456,7 @@ def get_commands(self):
"delete-project": self.delete_project,
"upload-application": self.upload_application_file,
"upload-test": self.upload_test_file,
"upload-data": self.upload_data_file,
"start-test-run": self.start_test_run,
"test-run": self.get_test_run,
"test-runs": self.print_project_test_runs,
Expand Down