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

Add the cameras to the POCS tests #646

Merged
merged 3 commits into from
Sep 30, 2018
Merged

Add the cameras to the POCS tests #646

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aaf353
* Add the cameras to the POCS tests
wtgee Sep 30, 2018
a4f0211
Merge branch 'develop' of https://github.com/panoptes/POCS into camer…
wtgee Sep 30, 2018
21cd122
Added some docstring
wtgee Sep 30, 2018
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
10 changes: 9 additions & 1 deletion pocs/tests/test_pocs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from pocs.utils.messaging import PanMessaging
from pocs.utils import error
from pocs.utils import current_time
from pocs.camera import create_cameras_from_config


def wait_for_running(sub, max_duration=90):
Expand All @@ -35,9 +36,16 @@ def wait_for_state(sub, state, max_duration=90):


@pytest.fixture(scope='function')
def observatory(config, db_type):
def cameras(config):
"""Get the default cameras from the config."""
return create_cameras_from_config(config)


@pytest.fixture(scope='function')
def observatory(config, db_type, cameras):
observatory = Observatory(
config=config,
cameras=cameras,
simulator=['all'],
ignore_local_config=True,
db_type=db_type
Expand Down