This commit is contained in:
Tomas Groth 2014-11-06 10:42:54 +01:00
parent b6e0036383
commit ff4ddefa77
4 changed files with 3 additions and 4 deletions

View File

@ -45,7 +45,6 @@ if __name__ == '__main__':
# Mac OS X passes arguments like '-psn_XXXX' to the application. This argument is actually a process serial number. # Mac OS X passes arguments like '-psn_XXXX' to the application. This argument is actually a process serial number.
# However, this causes a conflict with other OpenLP arguments. Since we do not use this argument we can delete it # However, this causes a conflict with other OpenLP arguments. Since we do not use this argument we can delete it
# to avoid any potential conflicts. # to avoid any potential conflicts.
#if sys.platform.startswith('darwin'):
if is_macosx(): if is_macosx():
sys.argv = [x for x in sys.argv if not x.startswith('-psn')] sys.argv = [x for x in sys.argv if not x.startswith('-psn')]
main() main()

View File

@ -28,4 +28,4 @@
############################################################################### ###############################################################################
""" """
The Projector driver module. The Projector driver module.
""" """

View File

@ -157,4 +157,4 @@ class TestSettingsForm(TestCase):
# THEN: The general tab's cancel() method should have been called, but not the themes tab # THEN: The general tab's cancel() method should have been called, but not the themes tab
mocked_general_cancel.assert_called_with() mocked_general_cancel.assert_called_with()
self.assertEqual(0, mocked_theme_cancel.call_count, 'The Themes tab\'s cancel() should not have been called') self.assertEqual(0, mocked_theme_cancel.call_count, 'The Themes tab\'s cancel() should not have been called')

View File

@ -95,4 +95,4 @@ class TestImageMediaItem(TestCase, TestMixin):
self.form.save() self.form.save()
# THEN: the post process should be requested # THEN: the post process should be requested
self.assertEqual(1, self.form.settings_form.register_post_process.call_count, self.assertEqual(1, self.form.settings_form.register_post_process.call_count,
'Image Post processing should have been requested') 'Image Post processing should have been requested')