From 11b2a73549df60bdd19aecb98dc4b9e71a40c0ac Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Mon, 31 Jul 2017 11:38:08 -0700 Subject: [PATCH] NSBperf: don't exit during import time This was breaking testr unittests. Don't do this like this during import time, only do them in if __name__ sections, otherwise when anything else tries to import this module it exists. Change-Id: Ia17f5e1a5cbe07ab287d3b95e96489b8a6248170 Signed-off-by: Ross Brattain --- yardstick/cmd/NSBperf.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/yardstick/cmd/NSBperf.py b/yardstick/cmd/NSBperf.py index 4e7590ea5..2dc0f65e7 100755 --- a/yardstick/cmd/NSBperf.py +++ b/yardstick/cmd/NSBperf.py @@ -30,13 +30,6 @@ from six.moves import input CLI_PATH = os.path.dirname(os.path.realpath(__file__)) REPO_PATH = os.path.abspath(os.path.join(CLI_PATH, os.pardir)) -PYTHONPATH = os.environ.get("PYTHONPATH", False) -VIRTUAL_ENV = os.environ.get("VIRTUAL_ENV", False) - - -if not PYTHONPATH or not VIRTUAL_ENV: - print("Please setup env PYTHONPATH & VIRTUAL_ENV environment varaible.") - raise SystemExit(1) def sigint_handler(*args, **kwargs): -- 2.16.6