openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/junefixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~trb143/openlp/junefixes/+merge/172855

Fix the broken test before Raoul rips it out
-- 
https://code.launchpad.net/~trb143/openlp/junefixes/+merge/172855
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/junefixes into lp:openlp.

=== modified file 'tests/functional/openlp_core_lib/test_serviceitem.py'
--- tests/functional/openlp_core_lib/test_serviceitem.py	2013-06-14 20:38:37 +0000
+++ tests/functional/openlp_core_lib/test_serviceitem.py	2013-07-03 16:36:33 +0000
@@ -272,13 +272,13 @@
         service_item.add_icon = MagicMock()
 
         # WHEN: adding an media from a saved Service and mocked exists
-        line = self.convert_file_service_item(u'migrate_video_20_22.osd')
+        line = read_service_from_file(u'migrate_video_20_22.osd')
         with patch('os.path.exists'):
-            service_item.set_from_service(line, TEST_PATH)
+            service_item.set_from_service(line[0], TEST_RESOURCES_PATH)
 
         # THEN: We should get back a converted service item
         assert service_item.is_valid is True, u'The new service item should be valid'
-        assert service_item.processor is None, u'The Processor should have been set'
-        assert service_item.title is None, u'The title should be set to a value'
+        assert service_item.processor == u'VLC', u'The Processor should have been set'
+        assert service_item.title is not None, u'The title should be set to a value'
         assert service_item.is_capable(ItemCapabilities.HasDetailedTitleDisplay) is False, \
             u'The Capability should have been removed'