mgr/dashboard: add test_module_selftest to API tests

* This test suite helps to catch mgr module regressions introduced by
dashboard feature/bugfix.
* Fixed: 'ceph -w' now behaves properly for Python 3.

Fixes: https://tracker.ceph.com/issues/38394
Signed-off-by: Alfonso Martínez <almartin@redhat.com>

diff --git a/src/ceph.in b/src/ceph.in
index c279960d124e4fc96945c78cdf50c6ab419e1a51..f060023f57c6b481f9ad8226c00d6eb648bef25a 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1065,6 +1065,8 @@ def main():
         # an awfully simple callback
         def watch_cb(arg, line, channel, name, who, stamp_sec, stamp_nsec, seq, level, msg):
             # Filter on channel
+            if sys.version_info[0] >= 3:
+                channel = channel.decode('utf-8')
             if (channel == parsed_args.watch_channel or \
                            parsed_args.watch_channel == "*"):
                 print(line.decode('utf-8'))

diff --git a/src/pybind/mgr/dashboard/run-backend-api-tests.sh b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
index 9a3a47fe76386f05b574805f1b7a6416ed50b0eb..1cba1de980d796474f11d673c62cbe05080cad9c 100755 (executable)
--- a/src/pybind/mgr/dashboard/run-backend-api-tests.sh
+++ b/src/pybind/mgr/dashboard/run-backend-api-tests.sh
@@ -109,7 +109,7 @@ run_teuthology_tests() {
     TEST_CASES=''
     if [[ "$@" == '' || "$@" == '--create-cluster-only' ]]; then
       TEST_CASES=`for i in \`ls $BUILD_DIR/../qa/tasks/mgr/dashboard/test_*\`; do F=$(basename $i); M="${F%.*}"; echo -n " tasks.mgr.dashboard.$M"; done`
-      TEST_CASES="tasks.mgr.test_dashboard $TEST_CASES"
+      TEST_CASES="tasks.mgr.test_module_selftest tasks.mgr.test_dashboard $TEST_CASES"
       if [[ "$@" == '--create-cluster-only' ]]; then
         OPTIONS="$@"
       fi