← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~phill-ridout/openlp/bug1336020 into lp:openlp

 

Phill has proposed merging lp:~phill-ridout/openlp/bug1336020 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1336020 in OpenLP: "Typo's in test_file_dialog.py"
  https://bugs.launchpad.net/openlp/+bug/1336020

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/bug1336020/+merge/225085

Fixed test in test_file_dialog.py

lp:~phill-ridout/openlp/bug1336020 (revision 2395)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/497/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/455/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/400/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/359/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/239/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/113/
-- 
https://code.launchpad.net/~phill-ridout/openlp/bug1336020/+merge/225085
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/bug1336020 into lp:openlp.
=== modified file 'tests/functional/openlp_core_lib/test_file_dialog.py'
--- tests/functional/openlp_core_lib/test_file_dialog.py	2014-04-20 20:19:21 +0000
+++ tests/functional/openlp_core_lib/test_file_dialog.py	2014-06-30 21:12:19 +0000
@@ -65,11 +65,11 @@
 
         # THEN: os.path.exists should have been called with known args. QmessageBox.information should have been
         #       called. The returned result should correlate with the input.
-        self.mocked_os.path.exists.assert_callde_with('/Valid File')
-        self.mocked_os.path.exists.assert_callde_with('/url%20encoded%20file%20%231')
-        self.mocked_os.path.exists.assert_callde_with('/url encoded file #1')
-        self.mocked_os.path.exists.assert_callde_with('/non-existing')
-        self.mocked_os.path.exists.assert_callde_with('/non-existing')
+        self.mocked_os.path.exists.assert_any_call('/Valid File')
+        self.mocked_os.path.exists.assert_any_call('/url%20encoded%20file%20%231')
+        self.mocked_os.path.exists.assert_any_call('/url encoded file #1')
+        self.mocked_os.path.exists.assert_any_call('/non-existing')
+        self.mocked_os.path.exists.assert_any_call('/non-existing')
         self.mocked_qt_gui.QmessageBox.information.called_with(self.mocked_parent, UiStrings().FileNotFound,
                                                                UiStrings().FileNotFoundMessage % '/non-existing')
         self.assertEqual(result, ['/Valid File', '/url encoded file #1'], 'The returned file list is incorrect')


Follow ups