From 9ce1c5619f89ac4d5db2fe084b975e5f9d9ae7fc Mon Sep 17 00:00:00 2001 From: Chuck SmileyRekiere Date: Wed, 19 May 2021 14:38:50 -0600 Subject: [PATCH] lf_check.py: allows for default DB then custom DB applied, test_l3_longevity.py : modified how type of service entered to help automation Signed-off-by: Chuck SmileyRekiere --- py-scripts/test_l3_longevity.py | 2 +- py-scripts/tools/lf_check.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/py-scripts/test_l3_longevity.py b/py-scripts/test_l3_longevity.py index 405a02a2..37e54664 100755 --- a/py-scripts/test_l3_longevity.py +++ b/py-scripts/test_l3_longevity.py @@ -105,7 +105,7 @@ class L3VariableTime(Realm): _proxy_str=_proxy_str, _capture_signal_list=_capture_signal_list) self.influxdb = influxdb - self.tos = tos.split() + self.tos = tos.split(",") self.endp_types = endp_types.split(",") self.side_b = side_b self.ssid_list = ssid_list diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index b10ed967..c278d4f0 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -278,11 +278,15 @@ class lf_check(): if self.use_factory_default_db == "TRUE": self.load_factory_default_db() + sleep(1) self.logger.info("FACTORY_DFLT loaded between tests with scenario.py --load FACTORY_DFLT") - elif self.use_blank_db == "TRUE": + if self.use_blank_db == "TRUE": self.load_blank_db() + sleep(1) self.logger.info("BLANK loaded between tests with scenario.py --load BLANK") - elif self.use_custom_db == "TRUE": + if self.use_custom_db == "TRUE": + self.load_factory_default_db() + sleep(1) try: self.load_custom_db(self.custom_db) self.logger.info("{} loaded between tests with scenario.py --load {}".format(self.custom_db,self.custom_db)) @@ -291,7 +295,7 @@ class lf_check(): else: self.logger.info("no db loaded between tests: {}".format(self.use_custom_db)) - sleep(5) # the sleep is to allow for the database to stablize + sleep(1) # the sleep is to allow for the database to stablize try: os.chdir(self.scripts_wd)