Skip to content

Master to devel #64

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
szprutamich merged 3 commits into from
May 12, 2017
Merged

Master to devel #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08efb1a
Merge pull request #59 from bitbar/devel
Jan 24, 2017
5a2102e
Version 2.39 compatibility
szprutamich May 12, 2017
64fed5b
Merge pull request #63 from szprutamich/master
lastverb May 12, 2017
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: 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.6.4'
version = '2.39'

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

__version__ = '2.6.4'
__version__ = '2.39'

FORMAT = "%(message)s"
logging.basicConfig(format=FORMAT)
Expand Down Expand Up @@ -568,13 +568,13 @@ def download_test_run(self, project_id, test_run_id):
logger.info("Test run %s: \"%s\" has %s device runs:" % (test_run['id'], test_run['displayName'], len(device_runs['data'])))

for device_run in device_runs['data']:
run_status = device_run['runStatus']
state = device_run['state']
logger.info("")
logger.info("%s \"%s\" %s" % (device_run['id'], device_run['device']['displayName'], run_status))
logger.info("%s \"%s\" %s" % (device_run['id'], device_run['device']['displayName'], state))

if run_status in ("SUCCEEDED", "FAILED", "EXCLUDED"):
if state in ("ABORTED", "TIMEOUT", "WARNING", "SUCCEEDED", "FAILED", "EXCLUDED"):
directory = "%s-%s/%d-%s" % (test_run_id, test_run['displayName'], device_run['id'], device_run['device']['displayName'])
session_id = device_run['deviceSessionId']
session_id = device_run['id']
files = self.get_device_run_files(project_id, test_run_id, session_id)
for file in files['data']:
if file['state'] == "READY":
Expand Down