From 12457b0efa232a1d604125a6356ede449856ec8e Mon Sep 17 00:00:00 2001 From: wanfeng <42433161+starrye@users.noreply.github.com> Date: Mon, 24 Jun 2024 15:04:29 +0800 Subject: [PATCH 1/3] [fix]rename compound_symbol.py --- .../symbol_manager/{compound _symbol.py => compound_symbol.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename srunner/osc2/symbol_manager/{compound _symbol.py => compound_symbol.py} (100%) diff --git a/srunner/osc2/symbol_manager/compound _symbol.py b/srunner/osc2/symbol_manager/compound_symbol.py similarity index 100% rename from srunner/osc2/symbol_manager/compound _symbol.py rename to srunner/osc2/symbol_manager/compound_symbol.py From 1325c8082312474b9618cc0b4fd390f72c821b12 Mon Sep 17 00:00:00 2001 From: wanfeng <42433161+starrye@users.noreply.github.com> Date: Wed, 3 Jul 2024 17:45:38 +0800 Subject: [PATCH 2/3] [fix]Remove duplicate clean method calls --- scenario_runner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_runner.py b/scenario_runner.py index 5f0e8e79a..f3206e2b7 100755 --- a/scenario_runner.py +++ b/scenario_runner.py @@ -200,9 +200,9 @@ def _cleanup(self): except RuntimeError: sys.exit(-1) - self.manager.cleanup() + # self.manager.cleanup() - CarlaDataProvider.cleanup() + # CarlaDataProvider.cleanup() for i, _ in enumerate(self.ego_vehicles): if self.ego_vehicles[i]: @@ -660,4 +660,4 @@ def main(): if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file + sys.exit(main()) From 6d653bbfa95c8ea581ec9e866485afe7c47ed5a2 Mon Sep 17 00:00:00 2001 From: wanfeng <42433161+starrye@users.noreply.github.com> Date: Tue, 5 Nov 2024 10:44:04 +0800 Subject: [PATCH 3/3] Fix Atomic_behaviors AddActor Func No return status --- srunner/scenariomanager/scenarioatomics/atomic_behaviors.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py index 56b03de0a..cd1a20fe3 100644 --- a/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py +++ b/srunner/scenariomanager/scenarioatomics/atomic_behaviors.py @@ -4593,7 +4593,9 @@ def update(self): new_status = py_trees.common.Status.SUCCESS except: # pylint: disable=bare-except print("ActorSource unable to spawn actor") - + new_status = py_trees.common.Status.FAILURE + finally: + return new_status class SwitchWrongDirectionTest(AtomicBehavior):