fixing some tests

sdss · Dec 11, 2019 · 319b31d · 319b31d
1 parent f89b295
commit 319b31d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/python/marvin/tests/core/test_config.py b/python/marvin/tests/core/test_config.py
@@ -198,7 +198,7 @@ def test_bad_login(self):
         assert 'You must have collaboration access to login.' in str(cm.value)
 
     @pytest.mark.parametrize('defrel, exprel',
-                             [('DR20', 'MPL-7'), ('bad_release', 'MPL-7')])
+                             [('DR20', 'MPL-9'), ('bad_release', 'MPL-9')])
     def test_bad_default_release(self, initconfig, defrel, exprel):
         ''' this tests some initial conditions on config '''
         config._release = defrel

diff --git a/python/marvin/tests/test_imports.py b/python/marvin/tests/test_imports.py
@@ -21,7 +21,6 @@ def test_access_tools_full_path(self):
         assert marvin.tools.maps.Maps is not None
         assert marvin.tools.modelcube.ModelCube is not None
         assert marvin.tools.spaxel.Spaxel is not None
-        assert marvin.tools.spaxel.Bin is not None
         assert marvin.tools.image.Image is not None
 
     def test_access_tools_from_root(self):
@@ -31,5 +30,4 @@ def test_access_tools_from_root(self):
         assert marvin.tools.Maps is not None
         assert marvin.tools.ModelCube is not None
         assert marvin.tools.Spaxel is not None
-        assert marvin.tools.Bin is not None
         assert marvin.tools.Image is not None
diff --git a/python/marvin/tests/tools/test_results.py b/python/marvin/tests/tools/test_results.py
@@ -97,7 +97,7 @@ def test_check_withadded(self, results, colmns, pars, columns):
     @pytest.mark.parametrize('results', [('nsa.z < 0.1 and emline_gflux_ha_6564 > 25')], indirect=True)
     @pytest.mark.parametrize('full, name', [('nsa.z', 'z'), ('cube.plateifu', 'plateifu'),
                                             ('cube.mangaid', 'mangaid'),
-                                            ('emline_gflux_ha_6564', 'haflux')])
+                                            ('spaxelprop.emline_gflux_ha_6564', 'haflux')])
     def test_colnames(self, results, full, name):
         cols = results.columns
         assert full in cols

diff --git a/python/marvin/tests/utils/datamodel/test_query.py b/python/marvin/tests/utils/datamodel/test_query.py
@@ -15,12 +15,14 @@
 from marvin.utils.datamodel.query import datamodel
 
 
-PARAM_COUNT = {'MPL-4': {'all': 571, 'nospaxels': 309, 'nodap': 309},
-               'MPL-5': {'all': 703, 'nospaxels': 322, 'nodap': 301},
-               'MPL-6': {'all': 1676, 'nospaxels': 1008, 'nodap': 1031},
-               'MPL-7': {'all': 1676, 'nospaxels': 1008, 'nodap': 1031},
-               'DR15': {'all': 1676, 'nospaxels': 1008, 'nodap': 1031},
-               'MPL-8': {'all': 1676, 'nospaxels': 1008, 'nodap': 1031}
+PARAM_COUNT = {'MPL-4': {'all': 574, 'nospaxels': 309, 'nodap': 309},
+               'MPL-5': {'all': 707, 'nospaxels': 322, 'nodap': 301},
+               'MPL-6': {'all': 1863, 'nospaxels': 1008, 'nodap': 1031},
+               'MPL-7': {'all': 1863, 'nospaxels': 1008, 'nodap': 1031},
+               'DR15': {'all': 1863, 'nospaxels': 1008, 'nodap': 1031},
+               'MPL-8': {'all': 2014, 'nospaxels': 1008, 'nodap': 1031},
+               'DR16': {'all': 1863, 'nospaxels': 1008, 'nodap': 1031},
+               'MPL-9': {'all': 2546, 'nospaxels': 1008, 'nodap': 1031}
                }