Address failing tests

spacetelescope · Oct 12, 2021 · b4934b9 · b4934b9
1 parent 03492b2
commit b4934b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/jwql/jwql_monitors/monitor_mast.py b/jwql/jwql_monitors/monitor_mast.py
@@ -29,8 +29,8 @@
 from jwql.utils.constants import JWST_INSTRUMENT_NAMES, JWST_DATAPRODUCTS
 from jwql.utils.logging_functions import configure_logging, log_info, log_fail
 from jwql.utils.permissions import set_permissions
-from jwql.utils.utils import get_config, initialize_instrument_monitor
-from jwql.utils.monitor_utils import update_monitor_table
+from jwql.utils.utils import get_config
+from jwql.utils import monitor_utils
 from jwql.utils.plotting import bar_chart
 
 
@@ -265,8 +265,8 @@ def monitor_mast():
 
     # Configure logging
     module = os.path.basename(__file__).strip('.py')
-    start_time, log_file = initialize_instrument_monitor(module)
+    start_time, log_file = monitor_utils.initialize_instrument_monitor(module)
 
     # Run the monitors
     monitor_mast()
-    update_monitor_table(module, start_time, log_file)
+    monitor_utils.update_monitor_table(module, start_time, log_file)
diff --git a/jwql/tests/test_dark_monitor.py b/jwql/tests/test_dark_monitor.py
@@ -24,6 +24,7 @@
 import numpy as np
 
 from jwql.instrument_monitors.common_monitors import dark_monitor
+from jwql.utils.monitor_utils import mast_query_darks
 from jwql.utils.utils import get_config
 
 ON_GITHUB_ACTIONS = '/home/runner' in os.path.expanduser('~') or '/Users/runner' in os.path.expanduser('~')
@@ -79,7 +80,7 @@ def test_mast_query_darks():
     readpatt = 'BRIGHT2'
     start_date = Time("2016-01-01T00:00:00").mjd
     end_date = Time("2018-01-01T00:00:00").mjd
-    query = dark_monitor.mast_query_darks(instrument, aperture, readpatt, start_date, end_date)
+    query = mast_query_darks(instrument, aperture, readpatt, start_date, end_date)
     apernames = [entry['apername'] for entry in query]
     filenames = [entry['filename'] for entry in query]
 

diff --git a/jwql/utils/monitor_utils.py b/jwql/utils/monitor_utils.py
@@ -20,6 +20,8 @@
 
 
 from jwql.database.database_interface import Monitor
+from jwql.jwql_monitors import monitor_mast
+from jwql.utils.constants import ASIC_TEMPLATES, JWST_DATAPRODUCTS
 from jwql.utils.logging_functions import configure_logging, get_log_status