From e992055fc12f994f59fef30334d8dc9ffe7421c6 Mon Sep 17 00:00:00 2001 From: erinnerim Date: Fri, 10 Sep 2021 18:02:13 -0700 Subject: [PATCH] Revert "importlib refactor lf_wifi_capacity_test.py" This reverts commit 1285f3207c6dd05c264854aae5fdcdecf97c3f6b. --- py-scripts/lf_wifi_capacity_test.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/py-scripts/lf_wifi_capacity_test.py b/py-scripts/lf_wifi_capacity_test.py index eb06cd3d..2f9ab4c2 100755 --- a/py-scripts/lf_wifi_capacity_test.py +++ b/py-scripts/lf_wifi_capacity_test.py @@ -303,9 +303,9 @@ show_4way: 1 show_latency: 1 """ + import sys import os -import importlib import argparse import time import json @@ -315,14 +315,11 @@ if sys.version_info[0] != 3: print("This script requires Python 3") exit(1) -if 'lanforge-scripts' not in sys.path: - sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../"))) +if 'py-json' not in sys.path: + sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) -LFUtils = importlib.import_module("lanforge-scripts.py-json.LANforge.LFUtils") -cv_test_manager = importlib.import_module("lanforge-scripts.py-json.cv_test_manager") -cv_test = cv_test_manager.cv_test -cv_add_base_parser = cv_test_manager.cv_add_base_parser -cv_base_adjust_parser = cv_test_manager.cv_base_adjust_parser +from cv_test_manager import * +from LANforge import LFUtils class WiFiCapacityTest(cv_test):