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.

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

Adapt to new dummy instrument #224

Merged
merged 28 commits into from
Nov 20, 2023
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5e3aa21
adapt test
burnout87 Nov 2, 2023
fa70e01
adapt test
burnout87 Nov 2, 2023
f315765
use dispatcher specific branch
burnout87 Nov 2, 2023
795f33f
Merge branch 'master' into adapt-to-new-dummy-instrument
burnout87 Nov 2, 2023
9cd264a
use dispatcher master branch
burnout87 Nov 9, 2023
9f252b4
Merge branch 'master' into adapt-to-new-dummy-instrument
burnout87 Nov 9, 2023
953c2a5
use dispatcher branch
burnout87 Nov 9, 2023
f69baf0
more logging test_instruments
burnout87 Nov 9, 2023
e4fbd30
back on master branch of dispatcher
burnout87 Nov 9, 2023
688313e
more logging
burnout87 Nov 9, 2023
ab8ff9b
setting token to None during test
burnout87 Nov 9, 2023
8750fb3
skipping one test
burnout87 Nov 9, 2023
e994625
making sure the env var for the token is reset at the end of test_tok…
burnout87 Nov 9, 2023
e4b5cb2
back on master branch, forcing a test to fail
burnout87 Nov 9, 2023
130cc5d
cleaning up token location test_token_inspect
burnout87 Nov 9, 2023
0094ee6
rever token clean-up test_cli
burnout87 Nov 9, 2023
5efc6c9
remove token clean up test_token_modify
burnout87 Nov 9, 2023
7cf40e6
no test_instruments logging
burnout87 Nov 9, 2023
c2afd2c
get_instruments_list no additional logging
burnout87 Nov 9, 2023
4b15fbe
get_instruments_list no additional logging
burnout87 Nov 9, 2023
aeb9d86
get_instruments_list no additional logging
burnout87 Nov 9, 2023
73a0678
get_instruments_list no additional logging
burnout87 Nov 9, 2023
545e27c
Merge branch 'master' into adapt-to-new-dummy-instrument
burnout87 Nov 17, 2023
a5895fd
removed testing dummy instruments dispatcher
burnout87 Nov 17, 2023
79b79de
Merge branch 'adapt-to-new-dummy-instrument' of github.com:oda-hub/od…
burnout87 Nov 17, 2023
8ecbae3
Merge branch 'master' into adapt-to-new-dummy-instrument
burnout87 Nov 17, 2023
9151813
Merge branch 'master' into adapt-to-new-dummy-instrument
burnout87 Nov 20, 2023
93b33eb
more loose test
burnout87 Nov 20, 2023
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
5 changes: 2 additions & 3 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import re
from typing import ChainMap
from click.testing import CliRunner
import pytest
Expand Down Expand Up @@ -74,9 +75,7 @@
result = runner.invoke(cli.cli, ['-u', dispatcher_live_fixture, 'get'], obj={})
assert result.exit_code == 0

assert "found instruments: ['empty', 'empty-async', 'empty-semi-async']" in caplog.text or \
burnout87 marked this conversation as resolved.
Show resolved Hide resolved
"found instruments: ['empty', 'empty-async', 'empty-semi-async', 'isgri', 'jemx', 'osa_fake']" in caplog.text or \
"found instruments: ['isgri', 'jemx', 'osa_fake', 'empty', 'empty-async', 'empty-semi-async']" in caplog.text
assert re.search(r"found instruments: \[.*\]", caplog.text)

Check warning on line 78 in tests/test_cli.py

View check run for this annotation

Codecov / codecov/patch

tests/test_cli.py#L78

Added line #L78 was not covered by tests

runner = CliRunner()
result = runner.invoke(cli.cli, ['-u', dispatcher_live_fixture, 'get', '-i', 'empty'], obj={})
Expand Down
Loading