From 6d8882d3024b0b56350ce1f3a107753016932c81 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Thu, 7 May 2015 23:53:19 +0200 Subject: [PATCH] Fix up some tests to dodge Windows --- tests/functional/openlp_core_ui_media/test_vlcplayer.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/functional/openlp_core_ui_media/test_vlcplayer.py b/tests/functional/openlp_core_ui_media/test_vlcplayer.py index 61b9dabac..eccac6893 100644 --- a/tests/functional/openlp_core_ui_media/test_vlcplayer.py +++ b/tests/functional/openlp_core_ui_media/test_vlcplayer.py @@ -370,13 +370,15 @@ class TestVLCPlayer(TestCase, TestMixin): self.assertEqual(10, mocked_controller.media_info.length) self.assertTrue(result) + @patch('openlp.core.ui.media.vlcplayer.is_win') @patch('openlp.core.ui.media.vlcplayer.get_vlc') @patch('openlp.core.ui.media.vlcplayer.os.path.normcase') - def load_audio_cd_test(self, mocked_normcase, mocked_get_vlc): + def load_audio_cd_test(self, mocked_normcase, mocked_get_vlc, mocked_is_win): """ Test loading an audio CD into VLC """ # GIVEN: A mocked out get_vlc() method + mocked_is_win.return_value = False media_path = '/dev/sr0' mocked_normcase.side_effect = lambda x: x mocked_vlc = MagicMock() @@ -460,13 +462,15 @@ class TestVLCPlayer(TestCase, TestMixin): self.assertEqual(10, mocked_controller.media_info.length) self.assertTrue(result) + @patch('openlp.core.ui.media.vlcplayer.is_win') @patch('openlp.core.ui.media.vlcplayer.get_vlc') @patch('openlp.core.ui.media.vlcplayer.os.path.normcase') - def load_audio_cd_no_tracks_test(self, mocked_normcase, mocked_get_vlc): + def load_audio_cd_no_tracks_test(self, mocked_normcase, mocked_get_vlc, mocked_is_win): """ Test loading an audio CD that has no tracks into VLC """ # GIVEN: A mocked out get_vlc() method + mocked_is_win.return_value = False media_path = '/dev/sr0' mocked_normcase.side_effect = lambda x: x mocked_vlc = MagicMock()