fix test no backend (#106)

* dummy change * change test order * Revert "change test order" This reverts commit 9ed7a43. * force serial tests * Revert "force serial tests" This reverts commit 887a888. * explicitly stop mock_backend to be unavailable * stop httpserver properly * test mock server lifetime * mv test * right port * test order * killing processes --------- Co-authored-by: burnout87 <[email protected]>
oda-hub · Aug 15, 2024 · 03fb407 · 03fb407
1 parent 9ea4d3c
commit 03fb407
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 from cdci_data_analysis.pytest_fixtures import (
+            kill_child_processes,
             dispatcher_debug,
             dispatcher_test_conf_fn,
             dispatcher_test_conf_with_external_products_url_fn,
@@ -192,7 +193,18 @@ def startup_check(self):
         logfile = xprocess.ensure("nb2service", Starter)
 
     except Exception as e:
-        xprocess.getinfo("nb2service").terminate()
+        process_info = xprocess.getinfo('nb2service')
+        pid = process_info.pid
+        kill_child_processes(pid, signal.SIGINT)
+        os.kill(pid, signal.SIGINT)
+        process_info.terminate()
         raise e
     yield 'http://localhost:9393/'
-    xprocess.getinfo("nb2service").terminate()
+    process_info = xprocess.getinfo('nb2service')
+    pid = process_info.pid
+
+    kill_child_processes(pid, signal.SIGINT)
+    os.kill(pid, signal.SIGINT)
+
+    process_info.terminate()
+
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
@@ -68,7 +68,26 @@ def test_discover_plugin():
     import cdci_data_analysis.plugins.importer as importer
 
     assert 'dispatcher_plugin_nb2workflow' in  importer.cdci_plugins_dict.keys()
-
+
+
+def test_instrument_backend_unavailable(dispatcher_live_fixture):
+    # current behaviour is to have instrument with no products, could be changed in the future
+    server = dispatcher_live_fixture
+    logger.info("constructed server: %s", server)
+
+    c = requests.get(server + "/api/meta-data",
+                    params = {'instrument': 'example0'})
+    logger.info("content: %s", c.text)
+    jdata = c.json()
+    logger.info(json.dumps(jdata, indent=4, sort_keys=True))
+    logger.info(jdata)
+    assert c.status_code == 200
+    for elem in jdata[0]:
+        if isinstance(elem, dict) and 'prod_dict' in elem.keys():
+            prod_dict = elem['prod_dict']
+    assert prod_dict == {}
+
+
 def test_instrument_available(dispatcher_live_fixture, mock_backend):
     server = dispatcher_live_fixture
     logger.info("constructed server: %s", server)
@@ -133,23 +152,6 @@ def test_instrument_products(dispatcher_live_fixture, mock_backend):
                          'lightcurve': 'lightcurve_query',
                          'table': 'table_query'}
 
-def test_instrument_backend_unavailable(dispatcher_live_fixture):
-    # current behaviour is to have instrument with no products, could be changed in the future
-    server = dispatcher_live_fixture
-    logger.info("constructed server: %s", server)
-
-    c = requests.get(server + "/api/meta-data",
-                    params = {'instrument': 'example0'})
-    logger.info("content: %s", c.text)
-    jdata = c.json()
-    logger.info(json.dumps(jdata, indent=4, sort_keys=True))
-    logger.info(jdata)
-    assert c.status_code == 200
-    for elem in jdata[0]:
-        if isinstance(elem, dict) and 'prod_dict' in elem.keys():
-            prod_dict = elem['prod_dict']
-    assert prod_dict == {}
-
 def test_instrument_added(conf_file, dispatcher_live_fixture, mock_backend):
     server = dispatcher_live_fixture
     logger.info("constructed server: %s", server)