mgr/mds_autoscaler: Add to tox.ini

Fixes: f69abe6291958a9ccfb85ce77c9b86e8af8ecf21
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py b/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
index 05f84db2fc07f55574f839782a4605828be51c21..2d6017d4a1886d9d3a5df7497062035619b0de4a 100644 (file)
--- a/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
+++ b/src/pybind/mgr/mds_autoscaler/tests/test_autoscaler.py
@@ -12,11 +12,10 @@ except ImportError:
 from mds_autoscaler.module import MDSAutoscaler
 
 
-
-@pytest.yield_fixture()
+@pytest.fixture()
 def mds_autoscaler_module():
 
-    yield MDSAutoscaler('cephadm', 0, 0)
+    yield MDSAutoscaler('mds_autoscaler', 0, 0)
 
 
 class TestCephadm(object):
@@ -56,7 +55,6 @@ class TestCephadm(object):
         apply = OrchResult(result='')
         _apply_mds.return_value = apply
 
-
         _get.return_value = {
             'filesystems': [
                 {
@@ -68,6 +66,7 @@ class TestCephadm(object):
                             }
                         ],
                         'standby_count_wanted': 2,
+                        'max_mds': 1
                     }
                 }
             ],

diff --git a/src/pybind/mgr/tests/__init__.py b/src/pybind/mgr/tests/__init__.py
index d4ab4d52de6fd8ad5bdb923ef0cd9ca32a461959..9d5e2dcabea7335233861b7b10b62316d07c27ef 100644 (file)
--- a/src/pybind/mgr/tests/__init__.py
+++ b/src/pybind/mgr/tests/__init__.py
@@ -73,7 +73,10 @@ if 'UNITTEST' in os.environ:
             except FileNotFoundError:
                 val = None
             mo = [o for o in self.MODULE_OPTIONS if o['name'] == key]
-            if len(mo) == 1:
+            if len(mo) >= 1:  # >= 1, cause self.MODULE_OPTIONS. otherwise it
+                #               fails when importing multiple modules.
+                if 'default' in mo and val is None:
+                    val = mo[0]['default']
                 if val is not None:
                     cls = {
                         'str': str,

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index d10cef5b3641688655479544f0a1a38614b18607..3a4c6b4c027281940bad0963ba272f5ffef30097 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -42,6 +42,7 @@ commands =
         mgr_util.py \
         tests/ \
         cephadm/ \
+        mds_autoscaler/ \
         orchestrator/ \
         insights/ \
         pg_autoscaler/ \