Commit 919f2266 authored by Gregory Harris's avatar Gregory Harris
Browse files

Post merge fixes

parent 707c2557
......@@ -146,7 +146,6 @@ class LasCommandLoader(CLICommandsLoader):
# 'download'
with ArgumentsContext(self, 'download') as arg_context:
with ArgumentsContext(self, 'search') as arg_context:
arg_context.argument('url', type=str, options_list=('-u', '--url'),
help='The base url of the OSDU instance.')
......
......@@ -317,10 +317,10 @@ class TestWellBoreService:
mock_well_log_service.recognize_log_family.assert_not_called()
assert not mock_well_log_service.recognize_log_family.called
mock_client.create_welllog.assert_called_once_with(well_log_record)
mock_client.post_welllog.assert_called_once_with(well_log_record)
else:
mock_well_log_service.recognize_log_family.assert_called_once_with(well_log_record, data_partition_id)
mock_client.create_welllog.assert_called_once_with(well_log_record_recognized)
mock_client.post_welllog.assert_called_once_with(well_log_record_recognized)
mock_client.get_welllog_record.assert_called_once_with(well_log_ids[0])
mock_mapper.extract_log_data.assert_called_once()
......@@ -348,7 +348,7 @@ class TestWellBoreService:
mock_mapper.map_to_wellbore_record.assert_called_once()
mock_client.create_wellbore.assert_not_called()
mock_client.create_welllog.assert_not_called()
mock_client.post_welllog.assert_not_called()
mock_client.add_welllog_data.assert_not_called()
def test_get_wellbore_by_name_raises_on_conflict(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment