Skip to content

Commit ca898e5

Browse files
committed
Restore all tests
Signed-off-by: R Kent James <[email protected]>
1 parent bcb37d7 commit ca898e5

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

ament_cmake_python_test/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ find_package(ament_cmake_core REQUIRED)
66

77
# Uncomment to debug CMake variables
88
#
9-
get_cmake_property(_variableNames VARIABLES)
10-
list (SORT _variableNames)
11-
foreach (_variableName ${_variableNames})
12-
message(STATUS "${_variableName}=${${_variableName}}")
13-
endforeach()
9+
#get_cmake_property(_variableNames VARIABLES)
10+
#list (SORT _variableNames)
11+
#foreach (_variableName ${_variableNames})
12+
# message(STATUS "${_variableName}=${${_variableName}}")
13+
#endforeach()
1414

1515
if(BUILD_TESTING)
1616
find_package(ament_cmake_pytest REQUIRED)

ament_cmake_python_test/test/build_with_colcon.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
'name': 'python_package',
3838
'description': 'Package with python code',
3939
},
40-
]
41-
OTHER_TESTS_OPTIONS = [
4240
{
4341
'name': 'python_package_symlink',
4442
'description': 'Package with python code, installed with symlink in build',
@@ -160,8 +158,6 @@ def do_build_package(package_name, options=None, base_prefix=SOURCE_DIR / 'test'
160158

161159

162160
def do_test_package(package_name, options):
163-
print(f"Testing package {package_name} PWD tree:")
164-
list_files(str(PWD))
165161
if options['destination']:
166162
install_path = PWD / INSTALL_BASE / package_name / options['destination'] / package_name
167163
else:
@@ -204,18 +200,3 @@ def do_test_package(package_name, options):
204200
print(f"Testing script installed in package {package_name}")
205201
script_path = PWD / INSTALL_BASE / package_name / options['scripts_destination'] / 'do_something'
206202
assert script_path.exists(), f"script do_something does not exist for {package_name}: {script_path}"
207-
208-
# If we got this far, the test passed, but we want to see output.
209-
assert(False)
210-
211-
def list_files(startpath):
212-
# Adapted from https://stackoverflow.com/a/9727671
213-
for root, dirs, files in os.walk(startpath):
214-
level = root.replace(startpath, '').count(os.sep)
215-
indent = ' ' * 4 * (level)
216-
print('{}{}/'.format(indent, os.path.basename(root)))
217-
subindent = ' ' * 4 * (level + 1)
218-
for f in files:
219-
root, ext = os.path.splitext(f)
220-
if ext not in ['.pyc', '.pyo', '.c', '.cpp', '.h', '.hpp', '.cmake','.so', '.sh', '.dsv', '.ps1']:
221-
print('{}{}'.format(subindent, f))

0 commit comments

Comments
 (0)