Skip to content

Master to devel sync #81

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 4 commits into from
May 11, 2018
Merged

Master to devel sync #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3cb654
Merge pull request #79 from bitbar/devel
Jan 23, 2018
e1b6e25
Don't separately update project when calling start_test_run()
May 3, 2018
760e427
Bumped version to 2.41.4 (fix for start_test_run)
May 3, 2018
82605cd
Merge pull request #80 from ekreutz/start_test_run
szprutamich May 7, 2018
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
2 changes: 2 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.41.4
* Don't separately update project when calling start_test_run()
2.41.3
* Isolate Pillow import, with fallback if import fails
2.41.2
Expand Down
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 @@ -3,7 +3,7 @@
import sys, os


version = '2.41.3'
version = '2.41.4'

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

__version__ = '2.41.3'
__version__ = '2.41.4'

FORMAT = "%(message)s"
logging.basicConfig(format=FORMAT)
Expand Down Expand Up @@ -426,45 +426,38 @@ def set_project_framework(self, project_id, frameworkId):
""" Start a test run on a device group
"""
def start_test_run(self, project_id, device_group_id=None, device_model_ids=None, name=None, additional_params={}):
me = self.get_me()
payload={} if name is None else {'name':name}
# check project validity
project = self.get_project(project_id)
if not 'id' in project:
print "Project %s not found" % project_id
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)

if device_group_id is not None:
device_group = self.get("users/%s/device-groups/%s" % (me['id'], device_group_id))
if not 'id' in device_group:
print "Device group %s not found" % device_group_id
sys.exit(1)

if int(device_group['deviceCount']) == 0:
print "ERROR: No devices at device group %s" % device_group['id']
sys.exit(1)
# start populating parameters for the request payload...
payload={}

# Update device group
reply = self.set_project_config(project_id=project_id, payload={'usedDeviceGroupId': device_group_id})
if int(reply['usedDeviceGroupId']) != int(device_group_id):
print "Unable to set used device group to %s for project %s" % (device_group_id, project_id)
sys.exit(1)
print "Starting test run on project %s \"%s\" using device group %s \"%s\"" % (project['id'], project['name'], device_group['id'], device_group['displayName'])
if name is not None:
payload['name'] = name

if device_group_id is not None:
payload['usedDeviceGroupId'] = device_group_id
print "Starting test run on project %s \"%s\" using device group %s" % (project['id'], project['name'], device_group_id)
elif device_model_ids is not None:
payload['usedDeviceIds[]'] = device_model_ids
print "Starting test run on project %s \"%s\" using device models ids %s" % (project['id'], project['name'], device_model_ids)
else:
payload={'usedDeviceIds[]': device_model_ids}
print "Starting test run on project %s \"%s\" using device models ids %s " % (project['id'], project['name'], device_model_ids)
print "Either device group or device models must be defined"
sys.exit(1)

# Start run
path = "/users/%s/projects/%s/runs" % ( me['id'], project_id )
# add optional request params that the user might have specified
payload.update(additional_params)
reply = self.post(path=path, payload=payload)
print "Test run id: %s" % reply['id']
print "Name: %s" % reply['displayName']
return reply['id']

# actually start the test run
me = self.get_me()
path = "/users/%s/projects/%s/runs" % (me['id'], project_id)
test_run = self.post(path=path, payload=payload)
print "Test run id: %s" % test_run['id']
print "Name: %s" % test_run['displayName']
return test_run['id']


""" Start a test run on a device group and wait for completion
Expand Down