jenkins-bot has submitted this change and it was merged.

Change subject: Remove imageuncat from script tests ......................................................................

Remove imageuncat from script tests

imageuncat is causing the travis builds to halt.

Also replace 'PIL' with module name 'ImageTk' in dependency check.

Change-Id: If188c217f2d193da1b6333f04191e320d2e795b5 --- M tests/script_tests.py 1 file changed, 4 insertions(+), 2 deletions(-)

Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified

diff --git a/tests/script_tests.py b/tests/script_tests.py index 523d882..52ef10e 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -24,7 +24,7 @@ 'script_wui.py': ['crontab', 'lua'], # Note: package 'lunatic-python' provides module 'lua'

- 'flickrripper.py': ['PIL', 'flickrapi'], + 'flickrripper.py': ['ImageTk', 'flickrapi'], # Note: 'PIL' is not available via pip2.7 on MS Windows, # however it is available with setuptools. } @@ -51,7 +51,9 @@ script_list = [name[0:-3] for name in dir_list # strip .py if name.endswith('.py') and not name.startswith('_') # skip __init__.py and _* - and check_script_deps(name)] + and check_script_deps(name) + and name != 'imageuncat.py' # this halts indefinitely + ] return script_list

script_input = {