Skip to content

v2.6.3 #55

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 6 commits into from
Dec 2, 2016
Merged

v2.6.3 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d955f9
added method for getting test run files with possibility to filter fi…
Nov 9, 2016
f363da5
added command to command listing
Nov 9, 2016
df330ef
Merge pull request #53 from sagge/master
Nov 10, 2016
55693da
added missing 'self.' declaration
Nov 10, 2016
0befc22
Merge pull request #54 from sagge/master
Nov 10, 2016
f053877
Bump version: 2.6.2 → 2.6.3
Dec 2, 2016
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.2'
version = '2.6.3'

setup(name='testdroid',
version=version,
Expand Down
13 changes: 11 additions & 2 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.2'
__version__ = '2.6.3'

FORMAT = "%(message)s"
logging.basicConfig(format=FORMAT)
Expand Down Expand Up @@ -549,6 +549,14 @@ def get_device_runs(self, project_id, test_run_id, limit=0):
def get_device_run_screenshots_list(self, project_id, test_run_id, device_run_id, limit=0):
return self.get("me/projects/%s/runs/%s/device-runs/%s/screenshots" % (project_id, test_run_id, device_run_id), payload = {'limit': limit})

""" Get list of files for device run
"""
def get_device_run_files(self, project_id, test_run_id, device_session_id, tags=None):
if tags is None:
return self.get("me/projects/%s/runs/%s/device-sessions/%s/output-file-set/files" % (project_id, test_run_id, device_session_id))
else:
return self.get("me/projects/%s/runs/%s/device-sessions/%s/output-file-set/files?tag[]=%s" % (project_id, test_run_id, device_session_id, tags))

""" Downloads test run files to a directory hierarchy
"""
def download_test_run(self, project_id, test_run_id):
Expand All @@ -566,7 +574,7 @@ def download_test_run(self, project_id, test_run_id):
if run_status in ("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']
files = self.get("me/projects/%s/runs/%s/device-sessions/%s/output-file-set/files" % (project_id, test_run_id, session_id))
files = self.get_device_run_files(project_id, test_run_id, session_id)
for file in files['data']:
if file['state'] == "READY":
full_path = "%s/%s" % (directory, file['name'])
Expand Down Expand Up @@ -713,6 +721,7 @@ def get_commands(self):
"test-run": self.get_test_run,
"test-runs": self.print_project_test_runs,
"device-runs": self.get_device_runs,
"device-run-files": self.get_device_run_files,
"download-test-run": self.download_test_run,
"download-test-screenshots": self.download_test_screenshots
}
Expand Down