From e90d58208dfd8df95456304f100722472da2742a Mon Sep 17 00:00:00 2001
From: Varsha Rao <varao@redhat.com>
Date: Fri, 24 May 2019 18:45:16 +0530
Subject: [PATCH] cephfs-shell: Add tox for testing with flake8

Fixes: https://tracker.ceph.com/issues/39947
Signed-off-by: Varsha Rao <varao@redhat.com>
---
 run-make-check.sh               |  2 +-
 src/test/CMakeLists.txt         |  7 +++++++
 src/tools/cephfs/CMakeLists.txt |  9 +++++----
 src/tools/cephfs/run-tox.sh     | 10 ++++++++++
 src/tools/cephfs/tox.ini        |  6 ++++++
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/tools/cephfs/run-tox.sh
 create mode 100644 src/tools/cephfs/tox.ini

diff --git a/run-make-check.sh b/run-make-check.sh
index eb9232c87f5..12360cda895 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -111,7 +111,7 @@ function run() {
     BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
     test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
     CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
-    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON"
+    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DWITH_CEPHFS_SHELL=ON"
     CMAKE_BUILD_OPTS+=$(detect_ceph_dev_pkgs)
     cat <<EOM
 Note that the binaries produced by this script do not contain correct time
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 04762e980e0..7ac965a90e4 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -580,6 +580,13 @@ if(WITH_MGR)
   list(APPEND tox_tests run-tox-python-common)
 endif()
 
+if(WITH_CEPHFS_SHELL)
+  add_test(NAME run-tox-cephfs-shell COMMAND bash ${CMAKE_SOURCE_DIR}/src/tools/cephfs/run-tox.sh)
+  list(APPEND tox_tests run-tox-cephfs-shell)
+  set(CEPHFS_SHELL_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/cephfs-shell-virtualenv)
+  list(APPEND env_vars_for_tox_tests CEPHFS_SHELL_VIRTUALENV=${CEPHFS_SHELL_VIRTUALENV})
+endif()
+
 set_property(
   TEST ${tox_tests}
   PROPERTY ENVIRONMENT ${env_vars_for_tox_tests})
diff --git a/src/tools/cephfs/CMakeLists.txt b/src/tools/cephfs/CMakeLists.txt
index 6ffa26628f1..de23878b181 100644
--- a/src/tools/cephfs/CMakeLists.txt
+++ b/src/tools/cephfs/CMakeLists.txt
@@ -41,9 +41,10 @@ install(TARGETS
 option(WITH_CEPHFS_SHELL "install cephfs-shell" OFF)
 if(WITH_CEPHFS_SHELL)
   if(NOT WITH_PYTHON3)
-    message(SEND_ERROR "Please enable WITH_PYTHON3 for cephfs-shell")
+    message(WARNING "Please enable WITH_PYTHON3 for cephfs-shell")
+  else()
+    include(Distutils)
+    distutils_install_module(cephfs-shell
+      PYTHON_VERSION 3)
   endif()
-  include(Distutils)
-  distutils_install_module(cephfs-shell
-    PYTHON_VERSION 3)
 endif()
diff --git a/src/tools/cephfs/run-tox.sh b/src/tools/cephfs/run-tox.sh
new file mode 100644
index 00000000000..070865de302
--- /dev/null
+++ b/src/tools/cephfs/run-tox.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+TOX_PATH=${CEPH_ROOT}/src/tools/cephfs/tox.ini
+CEPHFS=${CEPH_ROOT}/src/tools/cephfs
+
+tox -c ${TOX_PATH} -e flake8
+TOX_STATUS="$?"
+test "$TOX_STATUS" -ne "0"
+rm -rf ${CEPHFS}/.tox/
+rm -rf ${CEPHFS}/cephfs_shell.egg-info/
+exit $TOX_STATUS
diff --git a/src/tools/cephfs/tox.ini b/src/tools/cephfs/tox.ini
new file mode 100644
index 00000000000..147b114423e
--- /dev/null
+++ b/src/tools/cephfs/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+skipsdist = true
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 --ignore=W503 --max-line-length=100 cephfs-shell
-- 
2.47.3