JP-2928: Update regression tests to use flight data - set_telescope_p…

…ointing.add_wcs edition (spacetelescope#8887)

jwst/engdblog/engdblog.py

@@ -1,4 +1,5 @@
 from ..lib.engdb_tools import ENGDB_Service
+from ..lib.engdb_mast import EngdbMast
 from ..stpipe import Step
 
 
@@ -21,10 +22,10 @@ class EngDBLogStep(Step):
     """
 
     spec = """
-    stime = string(default='2021-01-25')  # Start time
-    etime = string(default='2021-01-27')  # End time
+    stime = string(default='2022-01-25 02:00:00')  # Start time
+    etime = string(default='2022-01-26 02:10:00')  # End time
     verbosity = option('initial', 'all', default='initial')  # How much to report.
-    engdb_url = string(default='http://localhost')  # Mock url
+    engdb_url = string(default=None)  # Mock url
     """
 
     def process(self, mnemonics):
@@ -46,7 +47,10 @@ def process(self, mnemonics):
         stime = self.stime
         etime = self.etime
         verbosity = self.verbosity
-        edb = ENGDB_Service(base_url=self.engdb_url)
+        if self.engdb_url is not None:
+            edb = ENGDB_Service(base_url=self.engdb_url)
+        else:
+            edb = EngdbMast()
 
         if isinstance(mnemonics, str):
             mnemonics = [mnemonics]

jwst/engdblog/tests/test_engdblog.py

@@ -4,9 +4,8 @@
 import os
 import pytest
 from tempfile import TemporaryDirectory
-
+from jwst.lib import engdb_mast
 from jwst.engdblog import EngDBLogStep
-from jwst.lib.tests.engdb_mock import EngDB_Mocker
 
 
 def test_engdblogstep(caplog, engdb):
@@ -17,7 +16,7 @@ def test_engdblogstep(caplog, engdb):
     assert 'EngDBLogStep instance created' in caplog.text
     assert mnemonic in caplog.text
     assert "Step EngDBLogStep running with args (['{}'],)".format(mnemonic) in caplog.text
-    assert '{}[2021-01-25:2021-01-27] = '.format(mnemonic) in caplog.text
+    assert '{}[2022-01-25 02:00:00:2022-01-26 02:10:00] = '.format(mnemonic) in caplog.text
     assert 'Step EngDBLogStep done' in caplog.text
 
 
@@ -29,7 +28,7 @@ def test_barestring(caplog, engdb):
     assert 'EngDBLogStep instance created' in caplog.text
     assert mnemonic in caplog.text
     assert f"Step EngDBLogStep running with args ('{mnemonic}',)." in caplog.text
-    assert '{}[2021-01-25:2021-01-27] = '.format(mnemonic) in caplog.text
+    assert '{}[2022-01-25 02:00:00:2022-01-26 02:10:00] = '.format(mnemonic) in caplog.text
     assert 'Step EngDBLogStep done' in caplog.text
 
 
@@ -38,7 +37,7 @@ def test_badmnemonic(caplog, engdb):
     result = EngDBLogStep.call([mnemonic])
     assert isinstance(result, dict)
     assert len(result) == 0
-    assert 'Cannot retrieve info for {}'.format(mnemonic) in caplog.text
+    assert '{} has no entries in time range'.format(mnemonic) in caplog.text
 
 
 def test_novalues(caplog, engdb):
@@ -65,13 +64,12 @@ def test_multi_mnemonics(caplog, engdb):
     result = EngDBLogStep.call(mnemonics)
     assert len(result) == 2
     for mnemonic in mnemonics:
-        assert '{}[2021-01-25:2021-01-27] = '.format(mnemonic) in caplog.text
+        assert '{}[2022-01-25 02:00:00:2022-01-26 02:10:00] = '.format(mnemonic) in caplog.text
 
 
 # #####################
 # Utilities for testing
 # #####################
 @pytest.fixture
 def engdb():
-    with EngDB_Mocker() as mocker:  # noqa: F841
-        yield
+    yield engdb_mast.EngdbMast()

jwst/lib/engdb_mast.py

@@ -187,8 +187,6 @@ def configure(self, base_url=None, token=None):
         # Get the token
         if token is None:
             token = getenv('MAST_API_TOKEN', None)
-        if token is None:
-            raise RuntimeError('No MAST token provided but is required. See https://auth.mast.stsci.edu/ for more information.')
         self.token = token
 
         # Get various timeout parameters