Skip to content
This repository was archived by the owner on May 31, 2025. It is now read-only.

[roslaunch-check] Use roslaunch.core.printerrlog for printing error message. #1193

Merged
dirk-thomas merged 1 commit into from
Dec 19, 2017
Merged

[roslaunch-check] Use roslaunch.core.printerrlog for printing error message. #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tools/roslaunch/scripts/roslaunch-check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import sys

import rospkg

import roslaunch
import roslaunch.rlutil
import rosunit

Expand Down Expand Up @@ -116,7 +117,7 @@ if __name__ == '__main__':
message = "roslaunch check [%s] failed"%(roslaunch_path)
f.write(rosunit.junitxml.test_failure_junit_xml(test_name, message, stdout=error_msg,
class_name="roslaunch.RoslaunchCheck", testcase_name="%s_%s" % (pkg, outname)))
print("wrote test file to [%s]"%test_file)
roslaunch.core.printerrlog("wrote test file to [%s]"%test_file)

@dirk-thomas dirk-thomas Oct 18, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to be an error message?

@130s 130s Nov 19, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if block is when error occurred. To highlight the file path this change is still useful.

sys.exit(1)
else:
print("passed")
Expand Down
4 changes: 2 additions & 2 deletions tools/roslaunch/src/roslaunch/rlutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ def check_roslaunch(f, use_test_depends=False):
print(e, file=sys.stderr)
miss_all = True
if miss_all:
print("Missing package dependencies: %s/package.xml: %s"%(pkg, ', '.join(miss)), file=sys.stderr)
roslaunch.core.printerrlog("Missing package dependencies: %s/package.xml: %s"%(pkg, ', '.join(miss)), file=sys.stderr)

@dirk-thomas dirk-thomas Feb 1, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new function doesn't support the file keyword argument. See #1317.

errors.append("Missing package dependencies: %s/package.xml: %s"%(pkg, ', '.join(miss)))
elif miss:
print("Missing package dependencies: %s/package.xml: %s (notify upstream maintainer)"%(pkg, ', '.join(miss)), file=sys.stderr)
roslaunch.core.printerrlog("Missing package dependencies: %s/package.xml: %s (notify upstream maintainer)"%(pkg, ', '.join(miss)), file=sys.stderr)

# load all node defs
nodes = []
Expand Down