pybind/mgr/snap_schedule: integrate with mgr wide tox testing

Signed-off-by: Jan Fajerski <jfajerski@suse.com>

diff --git a/src/pybind/mgr/snap_schedule/__init__.py b/src/pybind/mgr/snap_schedule/__init__.py
index 7b88dda8781c61124e520d9f667f6c3a62c8ed30..f2d056fedeb56a7b664d77176be1a1a531f3bb1c 100644 (file)
--- a/src/pybind/mgr/snap_schedule/__init__.py
+++ b/src/pybind/mgr/snap_schedule/__init__.py
@@ -2,5 +2,7 @@
 
 import os
 
-if 'CEPH_SNAP_SCHEDULE_UNITTEST' not in os.environ:
-    from .module import Module
+if 'UNITTEST' in os.environ:
+    import tests
+
+from .module import Module

diff --git a/src/pybind/mgr/snap_schedule/tox.ini b/src/pybind/mgr/snap_schedule/tox.ini
index 86c8481f1e0ba08aec368160b313f9544cc40ac8..1fde27980f84b5320c5d506a84a87cf34900370d 100644 (file)
--- a/src/pybind/mgr/snap_schedule/tox.ini
+++ b/src/pybind/mgr/snap_schedule/tox.ini
@@ -10,7 +10,7 @@ setenv=
     PATH = {toxinidir}/../../../../build/bin:$PATH
     py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2:..
     py3:  PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3:{toxinidir}
-    CEPH_SNAP_SCHEDULE_UNITTEST = true
+    UNITTEST = true
 deps =
     pytest
     mock

diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini
index 02561a49a30e29a8fcd8218339bf38b3fd581143..7ca38365bbe6eeba10206462debea7cde0ce2315 100644 (file)
--- a/src/pybind/mgr/tox.ini
+++ b/src/pybind/mgr/tox.ini
@@ -39,7 +39,8 @@ commands =
         orchestrator/ \
         insights/ \
         pg_autoscaler/ \
-        progress/}
+        progress/ \
+        snap_schedule}
 
 [testenv:mypy]
 basepython = python3
@@ -57,6 +58,7 @@ commands =
            orchestrator/__init__.py \
            progress/module.py \
            rook/module.py \
+           snap_schedule/module.py \
            test_orchestrator/module.py \
            mds_autoscaler/module.py \
            volumes/__init__.py