From 24f7ff7b61d8c3a24e912aa044a2467545cf9454 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Wed, 3 Jan 2024 13:24:13 +1100 Subject: [PATCH] autotest: Use contexts to control script lifetimes in networking tests this way if the test gets an exception part-way through the scripts are removed from the directories appropriately --- Tools/autotest/rover.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Tools/autotest/rover.py b/Tools/autotest/rover.py index eb398452bf..8fbf383e10 100644 --- a/Tools/autotest/rover.py +++ b/Tools/autotest/rover.py @@ -6646,7 +6646,8 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) '''web server''' applet_script = "net_webserver.lua" - self.install_applet_script(applet_script) + self.context_push() + self.install_applet_script_context(applet_script) self.set_parameters({ "SCR_ENABLE": 1, @@ -6672,14 +6673,15 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) self.TestWebServer("http://127.0.0.1:8081") self.context_pop() - self.remove_installed_script(applet_script) + self.context_pop() self.reboot_sitl() def NetworkingWebServerPPP(self): '''web server over PPP''' applet_script = "net_webserver.lua" - self.install_applet_script(applet_script) + self.context_push() + self.install_applet_script_context(applet_script) self.set_parameters({ "SCR_ENABLE": 1, @@ -6718,7 +6720,7 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm) self.TestWebServer("http://192.168.14.13:8081") self.context_pop() - self.remove_installed_script(applet_script) + self.context_pop() # restore rover without ppp enabled for next test os.unlink('build/sitl/bin/ardurover')