| |
@@ -81,12 +81,15 @@
|
| |
# Case 1, running in fg, progress on
|
| |
handle_import_cg(self.options, self.session, arguments)
|
| |
|
| |
- self.assertEqual(len(self.session.uploadWrapper.mock_calls), len(metadata['output']))
|
| |
- kwargs = self.session.uploadWrapper.call_args.kwargs
|
| |
- self.assertEqual(kwargs['callback'], _progress_callback)
|
| |
- self.session.CGImport.assert_called_once()
|
| |
- args = self.session.CGImport.call_args.args
|
| |
- self.assertEqual(args[0], metadata)
|
| |
+ self.assertEqual(
|
| |
+ self.session.uploadWrapper.mock_calls,
|
| |
+ [mock.call(mock.ANY, mock.ANY, callback=_progress_callback)
|
| |
+ for o in metadata['output']]
|
| |
+ )
|
| |
+
|
| |
+ self.session.CGImport.assert_called_once_with(
|
| |
+ metadata, self.unique_path_mock.return_value, None
|
| |
+ )
|
| |
self.linked_upload.assert_not_called()
|
| |
|
| |
def test_handle_import_cg_nodir(self):
|
| |
@@ -171,9 +174,9 @@
|
| |
|
| |
self.session.uploadWrapper.assert_not_called()
|
| |
self.linked_upload.assert_not_called()
|
| |
- self.session.CGImport.assert_called_once()
|
| |
- args = self.session.CGImport.call_args.args
|
| |
- self.assertEqual(args[0], metadata)
|
| |
+ self.session.CGImport.assert_called_once_with(
|
| |
+ metadata, self.unique_path_mock.return_value, None
|
| |
+ )
|
| |
|
| |
def test_handle_import_cg_draft(self):
|
| |
"""Test handle_import_cg function"""
|
| |
@@ -188,9 +191,9 @@
|
| |
handle_import_cg(self.options, self.session, arguments)
|
| |
|
| |
self.assertEqual(len(self.session.uploadWrapper.mock_calls), len(metadata['output']))
|
| |
- self.session.CGImport.assert_called_once()
|
| |
- args = self.session.CGImport.call_args.args
|
| |
- self.assertEqual(args[0], metadata)
|
| |
+ self.session.CGImport.assert_called_once_with(
|
| |
+ metadata, self.unique_path_mock.return_value, None
|
| |
+ )
|
| |
|
| |
def test_handle_import_cg_reserve(self):
|
| |
"""Test handle_import_cg function"""
|
| |
@@ -205,9 +208,9 @@
|
| |
handle_import_cg(self.options, self.session, arguments)
|
| |
|
| |
self.assertEqual(len(self.session.uploadWrapper.mock_calls), len(metadata['output']))
|
| |
- self.session.CGImport.assert_called_once()
|
| |
- args = self.session.CGImport.call_args.args
|
| |
- self.assertEqual(args[0], expect)
|
| |
+ self.session.CGImport.assert_called_once_with(
|
| |
+ metadata, self.unique_path_mock.return_value, None
|
| |
+ )
|
| |
|
| |
def test_handle_import_cg_linked(self):
|
| |
"""Test handle_import_cg function"""
|
| |
@@ -219,9 +222,9 @@
|
| |
|
| |
self.session.uploadWrapper.assert_not_called()
|
| |
self.assertEqual(len(self.linked_upload.mock_calls), len(metadata['output']))
|
| |
- self.session.CGImport.assert_called_once()
|
| |
- args = self.session.CGImport.call_args.args
|
| |
- self.assertEqual(args[0], metadata)
|
| |
+ self.session.CGImport.assert_called_once_with(
|
| |
+ metadata, self.unique_path_mock.return_value, None
|
| |
+ )
|
| |
|
| |
def test_handle_import_cg_noprogress(self):
|
| |
"""Test handle_import_cg function"""
|
| |
@@ -231,12 +234,14 @@
|
| |
|
| |
handle_import_cg(self.options, self.session, arguments)
|
| |
|
| |
- self.assertEqual(len(self.session.uploadWrapper.mock_calls), len(metadata['output']))
|
| |
- kwargs = self.session.uploadWrapper.call_args.kwargs
|
| |
- self.assertEqual(kwargs['callback'], None)
|
| |
- self.session.CGImport.assert_called_once()
|
| |
- args = self.session.CGImport.call_args.args
|
| |
- self.assertEqual(args[0], metadata)
|
| |
+ self.assertEqual(
|
| |
+ self.session.uploadWrapper.mock_calls,
|
| |
+ [mock.call(mock.ANY, mock.ANY, callback=None)
|
| |
+ for o in metadata['output']]
|
| |
+ )
|
| |
+ self.session.CGImport.assert_called_once_with(
|
| |
+ metadata, self.unique_path_mock.return_value, None
|
| |
+ )
|
| |
self.linked_upload.assert_not_called()
|
| |
|
| |
def test_handle_import_cg_help(self):
|
| |
julian8628
commented a month ago
call.argsandcall.kwargsare not available on python-mock for python2