Skip to content

Commit

Permalink
Add the cameras to the POCS tests
Browse files Browse the repository at this point in the history
Fix left out of #612.
  • Loading branch information
wtgee authored Sep 30, 2018
1 parent e64c296 commit b6749a7
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion pocs/tests/test_pocs.py
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

0 comments on commit b6749a7

Please sign in to comment.