From 7980231273ede4a4dfe50459885d80a96083459d Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Tue, 22 Apr 2014 22:13:36 +0200
Subject: [PATCH] Skip tests on windows.

---
 openlp/plugins/media/forms/mediaclipselectorform.py   | 11 ++++++++++-
 openlp/plugins/media/lib/mediaitem.py                 |  3 ++-
 .../media/forms/test_mediaclipselectorform.py         |  8 +++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/openlp/plugins/media/forms/mediaclipselectorform.py b/openlp/plugins/media/forms/mediaclipselectorform.py
index 11986acf5..653cfdae2 100644
--- a/openlp/plugins/media/forms/mediaclipselectorform.py
+++ b/openlp/plugins/media/forms/mediaclipselectorform.py
@@ -43,7 +43,16 @@ from PyQt4 import QtCore, QtGui
 from openlp.core.common import translate
 from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector
 from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.ui.media.vendor import vlc
+try:
+    from openlp.core.ui.media.vendor import vlc
+except (ImportError, NameError, NotImplementedError):
+    pass
+except OSError as e:
+    if sys.platform.startswith('win'):
+        if not isinstance(e, WindowsError) and e.winerror != 126:
+            raise
+    else:
+        raise
 
 log = logging.getLogger(__name__)
 
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 74e6750d7..9be15dbb5 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -278,7 +278,8 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
         check_directory_exists(self.service_path)
         self.load_list(Settings().value(self.settings_section + '/media files'))
         self.rebuild_players()
-        self.media_clip_selector_form = MediaClipSelectorForm(self, self.main_window, None)
+        if VLC_AVAILABLE:
+            self.media_clip_selector_form = MediaClipSelectorForm(self, self.main_window, None)
 
     def rebuild_players(self):
         """
diff --git a/tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py b/tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py
index 9484e92a7..241ef26c3 100644
--- a/tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py
+++ b/tests/interfaces/openlp_plugins/media/forms/test_mediaclipselectorform.py
@@ -29,7 +29,13 @@
 """
 Module to test the MediaClipSelectorForm.
 """
-from unittest import TestCase
+
+import os
+from unittest import TestCase, SkipTest
+from openlp.core.ui.media.vlcplayer import VLC_AVAILABLE
+
+if os.name == 'nt' and not VLC_AVAILABLE:
+    raise SkipTest('Windows without VLC, skipping this test since it cannot run without vlc')
 
 from PyQt4 import QtGui, QtTest, QtCore