From ac530d8a3429ed278726b934b5ce3295b0a6f8f1 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 15 Mar 2015 09:48:10 -0400 Subject: [PATCH] Don't crash trying to create a Gdk.Cursor without a DISPLAY; enable more tests for Travis --- .travis.yml | 2 +- gramps/gui/widgets/grabbers.py | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 282d0143a..4407e87b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,5 +25,5 @@ install: script: - mkdir -p /home/travis/.gramps/grampsdb/ - - DJANGO_SETTINGS_MODULE=gramps.webapp.settings nosetests3 --exclude=TestcaseGenerator --exclude=exportvcard_test --exclude=plugins --exclude=vcard --exclude=merge_ref_test --exclude=test_util_test --exclude=gramps.webapp --exclude=test2_exec_CLI --exclude=widgets --exclude=test3_files_in_import_dir --exclude=test_manual_run --exclude=gui gramps + - DJANGO_SETTINGS_MODULE=gramps.webapp.settings nosetests3 --exclude=TestcaseGenerator --exclude=exportvcard_test --exclude=plugins --exclude=vcard --exclude=merge_ref_test --exclude=test_util_test --exclude=test2_exec_CLI --exclude=test3_files_in_import_dir --exclude=test_manual_run gramps diff --git a/gramps/gui/widgets/grabbers.py b/gramps/gui/widgets/grabbers.py index 611dcba92..3f0242084 100644 --- a/gramps/gui/widgets/grabbers.py +++ b/gramps/gui/widgets/grabbers.py @@ -196,15 +196,24 @@ GRABBERS_SWITCH = [ ] # cursors - -CURSOR_UPPER = Gdk.Cursor.new(Gdk.CursorType.TOP_SIDE) -CURSOR_LOWER = Gdk.Cursor.new(Gdk.CursorType.BOTTOM_SIDE) -CURSOR_LEFT = Gdk.Cursor.new(Gdk.CursorType.LEFT_SIDE) -CURSOR_RIGHT = Gdk.Cursor.new(Gdk.CursorType.RIGHT_SIDE) -CURSOR_UPPER_LEFT = Gdk.Cursor.new(Gdk.CursorType.TOP_LEFT_CORNER) -CURSOR_UPPER_RIGHT = Gdk.Cursor.new(Gdk.CursorType.TOP_RIGHT_CORNER) -CURSOR_LOWER_LEFT = Gdk.Cursor.new(Gdk.CursorType.BOTTOM_LEFT_CORNER) -CURSOR_LOWER_RIGHT = Gdk.Cursor.new(Gdk.CursorType.BOTTOM_RIGHT_CORNER) +try: + CURSOR_UPPER = Gdk.Cursor.new(Gdk.CursorType.TOP_SIDE) + CURSOR_LOWER = Gdk.Cursor.new(Gdk.CursorType.BOTTOM_SIDE) + CURSOR_LEFT = Gdk.Cursor.new(Gdk.CursorType.LEFT_SIDE) + CURSOR_RIGHT = Gdk.Cursor.new(Gdk.CursorType.RIGHT_SIDE) + CURSOR_UPPER_LEFT = Gdk.Cursor.new(Gdk.CursorType.TOP_LEFT_CORNER) + CURSOR_UPPER_RIGHT = Gdk.Cursor.new(Gdk.CursorType.TOP_RIGHT_CORNER) + CURSOR_LOWER_LEFT = Gdk.Cursor.new(Gdk.CursorType.BOTTOM_LEFT_CORNER) + CURSOR_LOWER_RIGHT = Gdk.Cursor.new(Gdk.CursorType.BOTTOM_RIGHT_CORNER) +except: + CURSOR_UPPER = None + CURSOR_LOWER = None + CURSOR_LEFT = None + CURSOR_RIGHT = None + CURSOR_UPPER_LEFT = None + CURSOR_UPPER_RIGHT = None + CURSOR_LOWER_LEFT = None + CURSOR_LOWER_RIGHT = None CURSORS = [None, CURSOR_UPPER_LEFT,