Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test failures #201

Merged
merged 10 commits into from
Feb 29, 2024
Merged

Fix test failures #201

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
10a262d
Fix logging to handler config without loggers
mraspaud Feb 12, 2024
24c984a
Fix docstring
mraspaud Feb 12, 2024
5f1f2ca
Fix for default logging config to work
mraspaud Feb 12, 2024
99d4a6b
Fix time-dependent test
mraspaud Feb 12, 2024
3bed599
Make some more assertions in testing the default logging
mraspaud Feb 13, 2024
d69c843
Fix mock assertion
lahtinep Feb 28, 2024
dc27897
Fix test for discarding old data
lahtinep Feb 28, 2024
aaf85a9
Merge pull request #199 from mraspaud/fix-logging
mraspaud Feb 29, 2024
22aa930
Fix mock assertion
lahtinep Feb 28, 2024
a4ac1f5
Merge branch 'debug-ci-failures' of https://github.com/pnuu/trollflow…
lahtinep Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions trollflow2/tests/test_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,11 @@ def setUp(self):
def test_run_does_not_call_process_directly(self):
"""Test that process is called through Process."""
from trollflow2.launcher import Runner
with mock.patch('trollflow2.launcher.yaml.load'),\
mock.patch('trollflow2.launcher.open'),\
mock.patch('trollflow2.launcher.generate_messages') as generate_messages,\
mock.patch('trollflow2.launcher.process') as process,\
mock.patch('trollflow2.launcher.check_results'),\
with mock.patch('trollflow2.launcher.yaml.load'), \
mock.patch('trollflow2.launcher.open'), \
mock.patch('trollflow2.launcher.generate_messages') as generate_messages, \
mock.patch('trollflow2.launcher.process') as process, \
mock.patch('trollflow2.launcher.check_results'), \
mock.patch('multiprocessing.get_context'):
generate_messages.side_effect = ['foo', KeyboardInterrupt]
prod_list = {'product_list': {}}
Expand All @@ -400,8 +400,8 @@ def test_run_does_not_call_process_directly(self):
def test_run_relies_on_listener(self):
"""Test running relies on listener."""
from trollflow2.launcher import Runner
with mock.patch('trollflow2.launcher.yaml.load') as yaml_load,\
mock.patch('trollflow2.launcher.open'),\
with mock.patch('trollflow2.launcher.yaml.load') as yaml_load, \
mock.patch('trollflow2.launcher.open'), \
mock.patch('multiprocessing.get_context') as get_context, \
mock.patch('trollflow2.launcher.ListenerContainer') as lc_:
msg = mock.MagicMock()
Expand All @@ -420,7 +420,7 @@ def test_run_relies_on_listener(self):
runner.run()
except KeyboardInterrupt:
pass
listener.output_queue.called_once()
listener.output_queue.get.assert_called_once()
lc_.assert_called_with(addresses=None, nameserver='localhost',
topics=['/topic1', '/topic2'])
# Subscriber topics are removed from config
Expand Down Expand Up @@ -451,9 +451,9 @@ def test_subprocess_is_spawned(self):
def run_on_a_simple_product_list(config):
"""Run a simple (fake) product list."""
from trollflow2.launcher import Runner
with mock.patch('trollflow2.launcher.yaml.load') as yaml_load,\
mock.patch('trollflow2.launcher.open'),\
mock.patch('multiprocessing.get_context') as get_context,\
with mock.patch('trollflow2.launcher.yaml.load') as yaml_load, \
mock.patch('trollflow2.launcher.open'), \
mock.patch('multiprocessing.get_context') as get_context, \
mock.patch('trollflow2.launcher.ListenerContainer') as lc_:

msg = mock.MagicMock()
Expand Down Expand Up @@ -486,8 +486,8 @@ def setUp(self):
def test_run_keyboard_interrupt(self):
"""Test interrupting the run with a ctrl-C."""
from trollflow2.launcher import Runner
with mock.patch('trollflow2.launcher.yaml.load'),\
mock.patch('trollflow2.launcher.open'),\
with mock.patch('trollflow2.launcher.yaml.load'), \
mock.patch('trollflow2.launcher.open'), \
mock.patch('trollflow2.launcher.ListenerContainer') as lc_:
listener = mock.MagicMock()
get = mock.Mock()
Expand Down
3 changes: 2 additions & 1 deletion trollflow2/tests/test_trollflow2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,8 @@ def test_discard_old_data(self):
job = {'product_list': None, 'input_mda': {'start_time': dt.datetime(2020, 3, 18)}}
self.assertIsNone(check_metadata(job))
get_config_value.return_value = {'start_time': -2e6}
self.assertIsNone(check_metadata(job))
with self.assertRaises(AbortProcessing):
check_metadata(job)
mraspaud marked this conversation as resolved.
Show resolved Hide resolved
get_config_value.return_value = {'start_time': -60}
with self.assertRaises(AbortProcessing):
check_metadata(job)
Expand Down
Loading