From e48ba389e397b369a2655baa4cd04b5f7da2cd61 Mon Sep 17 00:00:00 2001 From: Kevin Ge Date: Thu, 25 Apr 2024 11:48:55 -0500 Subject: [PATCH] refactor: remove rtp change (a single space) from PR changes --- .../test/test_copyright.py | 25 ------------------- .../test/test_flake8.py | 25 ------------------- .../test/test_pep257.py | 23 ----------------- src/planning/rtp/rtp/rtp_node.py | 2 +- 4 files changed, 1 insertion(+), 74 deletions(-) delete mode 100755 src/control/pure_pursuit_controller/test/test_copyright.py delete mode 100755 src/control/pure_pursuit_controller/test/test_flake8.py delete mode 100755 src/control/pure_pursuit_controller/test/test_pep257.py diff --git a/src/control/pure_pursuit_controller/test/test_copyright.py b/src/control/pure_pursuit_controller/test/test_copyright.py deleted file mode 100755 index 97a39196e..000000000 --- a/src/control/pure_pursuit_controller/test/test_copyright.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2015 Open Source Robotics Foundation, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from ament_copyright.main import main -import pytest - - -# Remove the `skip` decorator once the source file(s) have a copyright header -@pytest.mark.skip(reason='No copyright header has been placed in the generated source file.') -@pytest.mark.copyright -@pytest.mark.linter -def test_copyright(): - rc = main(argv=['.', 'test']) - assert rc == 0, 'Found errors' diff --git a/src/control/pure_pursuit_controller/test/test_flake8.py b/src/control/pure_pursuit_controller/test/test_flake8.py deleted file mode 100755 index 27ee1078f..000000000 --- a/src/control/pure_pursuit_controller/test/test_flake8.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2017 Open Source Robotics Foundation, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from ament_flake8.main import main_with_errors -import pytest - - -@pytest.mark.flake8 -@pytest.mark.linter -def test_flake8(): - rc, errors = main_with_errors(argv=[]) - assert rc == 0, \ - 'Found %d code style errors / warnings:\n' % len(errors) + \ - '\n'.join(errors) diff --git a/src/control/pure_pursuit_controller/test/test_pep257.py b/src/control/pure_pursuit_controller/test/test_pep257.py deleted file mode 100755 index b234a3840..000000000 --- a/src/control/pure_pursuit_controller/test/test_pep257.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2015 Open Source Robotics Foundation, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from ament_pep257.main import main -import pytest - - -@pytest.mark.linter -@pytest.mark.pep257 -def test_pep257(): - rc = main(argv=['.', 'test']) - assert rc == 0, 'Found code style errors / warnings' diff --git a/src/planning/rtp/rtp/rtp_node.py b/src/planning/rtp/rtp/rtp_node.py index 64d6778a5..0a22af424 100755 --- a/src/planning/rtp/rtp/rtp_node.py +++ b/src/planning/rtp/rtp/rtp_node.py @@ -536,7 +536,7 @@ def costMapCb(self, msg: OccupancyGrid): if np.sqrt(pose[0]**2 + pose[1]**2) > lookahead_distance: lookahead_pose = pose break - + if lookahead_pose is None: lookahead_pose = poses_np_bl[-1]