From 891ae6d48997444df00a6a9abf79065a0d01d0a3 Mon Sep 17 00:00:00 2001 From: John Rusnak Date: Mon, 22 Jan 2018 17:14:11 -0800 Subject: [PATCH 1/3] Isoloate Pillow import, with fallback if import fails --- testdroid/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testdroid/__init__.py b/testdroid/__init__.py index 4d9e7bd..ff71e56 100755 --- a/testdroid/__init__.py +++ b/testdroid/__init__.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import os, sys, requests, json, logging, time, httplib, base64 -from PIL import Image from optparse import OptionParser from datetime import datetime @@ -633,9 +632,15 @@ def download_test_screenshots(self, project_id, test_run_id): ''' Earlier downloaded images are checked, and if needed re-downloaded. ''' try: + from PIL import Image im=Image.open(full_path) im.verify() logger.info("Screenshot %s already exists - skipping download" % full_path) + except ImportError: + if os.path.isfile(full_path): # fallback if Pillow fails to import + logger.info("Screenshot %s already exists - skipping download" % full_path) + else: + raise # jump to next block except: url = "me/projects/%s/runs/%s/device-runs/%s/screenshots/%s" % (project_id, test_run['id'], device_run['id'], screenshot['id']) prog = DownloadProgressBar() From c4ea4ab3d239901a5aefdfbf1a5abe57ce8ab2d3 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Wed, 24 Jan 2018 00:25:35 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Bump=20version:=202.41.2=20=E2=86=92=202.41?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.py | 2 +- testdroid/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a8fcad8..adfd8f2 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import sys, os -version = '2.41.2' +version = '2.41.3' setup(name='testdroid', version=version, diff --git a/testdroid/__init__.py b/testdroid/__init__.py index ff71e56..10cfd8a 100755 --- a/testdroid/__init__.py +++ b/testdroid/__init__.py @@ -4,7 +4,7 @@ from optparse import OptionParser from datetime import datetime -__version__ = '2.41.2' +__version__ = '2.41.3' FORMAT = "%(message)s" logging.basicConfig(format=FORMAT) From 44b2d97c38b3353f941b836b8d9737bbcdb64248 Mon Sep 17 00:00:00 2001 From: Sakari Rautiainen Date: Tue, 23 Jan 2018 15:28:12 -0800 Subject: [PATCH 3/3] v2.41.3 --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8041663..fc13b3b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +2.41.3 + * Isolate Pillow import, with fallback if import fails 2.41.2 * Add api to abort a test run 2.41.1