From 14034200d9e33adcaa62188b786ca5d80cee73f2 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 9 Jul 2019 03:54:18 -0400 Subject: [PATCH] test/bdevio: present info when RPC lib is missing from PYTHONPATH The test.py script relies upon importing SPDK Python RPC libs. This requires user to add ./spdk/scripts/ to PYTHONPATH. Unfortunately --help could not be reached when the import failed, to user executing the script directly wouldn't know that. This patch adds instructions for user when importing RPC lib fails. Change-Id: Icb87fbc5ae9d1c5b71699827d6ea0cd922d38627 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460908 Reviewed-by: Karol Latecki Reviewed-by: Paul Luse Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- test/bdev/bdevio/tests.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/bdev/bdevio/tests.py b/test/bdev/bdevio/tests.py index e89a5fb04c..8b46061d05 100755 --- a/test/bdev/bdevio/tests.py +++ b/test/bdev/bdevio/tests.py @@ -1,13 +1,17 @@ #!/usr/bin/env python3 - -from rpc.client import print_dict, JSONRPCException - import logging import argparse -import rpc import sys import shlex +try: + from rpc.client import print_dict, JSONRPCException + import rpc +except ImportError: + print("SPDK RPC library missing. Please add spdk/scripts/ directory to PYTHONPATH:") + print("'export PYTHONPATH=$PYTHONPATH:./spdk/scripts/'") + exit(1) + try: from shlex import quote except ImportError: