diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py index 5d25bd500..8c0382148 100755 --- a/libs/lanforge/lf_tools.py +++ b/libs/lanforge/lf_tools.py @@ -313,7 +313,7 @@ class ChamberView: time.sleep(2) self.CreateChamberview.show_text_blob(None, None, True) # Show changes on GUI self.CreateChamberview.sync_cv() - time.sleep(5) + time.sleep(15) return self.CreateChamberview, self.scenario_name def add_vlan(self, vlan_ids=[]): diff --git a/tests/fixtures_2x.py b/tests/fixtures_2x.py index f31250b86..eafaaaeae 100644 --- a/tests/fixtures_2x.py +++ b/tests/fixtures_2x.py @@ -711,24 +711,11 @@ class Fixtures_2x: #print(instantiate_profile_obj.base_profile_config) except Exception as e: + push_config_exception_variable = True ap_logs = ap_ssh.get_logread() - allure.attach(body=ap_logs, name="1st time Failure while pushing- AP Logs: ") - allure.attach(body=str(e), name="1st time Exception data after config push: ") + allure.attach(body=ap_logs, name="Failure while pushing- AP Logs: ") + allure.attach(body=str(e), name="Exception data after config push: ") print(e) - time.sleep(30) - print("Second time applying config") - try: - instantiate_profile_obj.push_config(serial_number=get_equipment_ref[0]) - except Exception as e: - push_config_exception_variable = True - ap_logs = ap_ssh.get_logread() - allure.attach(body=ap_logs, name="2nd time Failure while pushing- AP Logs: ") - allure.attach(body=str(e), name="2nd time Exception data after config push: ") - print(e) - - - - config = json.loads(str(instantiate_profile_obj.base_profile_config).replace(" ", "").replace("'", '"').replace("True", "true")) config["uuid"] = 0 @@ -883,9 +870,8 @@ class Fixtures_2x: allure.attach.file(source="lanforge_log_1.txt", name="lanforge_log_1") - request.addfinalizer(collect_logs_lf) if push_config_exception_variable: - pytest.fail("Command Timed Out") + request.addfinalizer(collect_logs_lf) return test_cases