Skip to content

Isolaote Pillow import, adding fallback if fails #78

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 2 commits into from
Jan 23, 2018
Merged

Isolaote Pillow import, adding fallback if fails #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fc7d84
Merge pull request #76 from bitbar/devel
Oct 13, 2017
891ae6d
Isoloate Pillow import, with fallback if import fails
Jan 23, 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
7 changes: 6 additions & 1 deletion testdroid/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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()
Expand Down