Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skipped tests #80

Merged
merged 9 commits into from
Nov 30, 2016
Merged

Skipped tests #80

merged 9 commits into from
Nov 30, 2016

Conversation

mikaelarguedas
Copy link
Contributor

@mikaelarguedas mikaelarguedas commented Nov 24, 2016

generate skipped result files + add skip option to all add_test macros

@mikaelarguedas mikaelarguedas added the in progress Actively being worked on (Kanban column) label Nov 24, 2016
@mikaelarguedas mikaelarguedas self-assigned this Nov 24, 2016
@mikaelarguedas
Copy link
Contributor Author

CI job testing this and the following PRs ros2/rcl#90, ament/ament_tools#125, ros2/system_tests#177

REQUIRED_FILES "${executable}"
LABELS "gtest"
)
endif()
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of duplicating the function call with all its arguments I would suggest to use a variable to either pass or not pass SKIP_TEST.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

good point: 17ae941

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks 91b19d2

skipped_result_file = _generate_result(
args.result_file,
None,
True
Copy link
Contributor

Choose a reason for hiding this comment

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

Keyword arguments should be passed with the keyword rather then as a positional argument. Then you also don't need the default value for failure_message.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks, using keyword arguments everywhere now 9c22bc9

@@ -231,20 +246,30 @@ def log(msg, **kwargs):
return rc


def _generate_result(result_file, failure_message=None):
def _generate_result(result_file, failure_message=None, skip=False):
Copy link
Contributor

Choose a reason for hiding this comment

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

To avoid similar problems in the future the signature could be changed to:

def _generate_result(result_file, *, failure_message=None, skip=False):

Copy link
Contributor Author

Choose a reason for hiding this comment

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

hooray Python3 argument parsing. 3d92b6b

Copy link
Contributor

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

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

With new CI

@mikaelarguedas
Copy link
Contributor Author

CI for this and all the associated PRs:
http://ci.ros2.org/job/ci_linux/1953/testReport/
http://ci.ros2.org/job/ci_osx/1505/testReport/
http://ci.ros2.org/job/ci_windows/1913/testReport/

I don't think the BlackBox failing tests on OSX are related to this PR

@mikaelarguedas mikaelarguedas merged commit 86da7c0 into master Nov 30, 2016
@mikaelarguedas mikaelarguedas deleted the skipped_tests branch November 30, 2016 18:20
@mikaelarguedas mikaelarguedas removed the in progress Actively being worked on (Kanban column) label Nov 30, 2016
@dirk-thomas
Copy link
Contributor

When adding new arguments please also update the corresponding docblock. See 9f84a82

@mikaelarguedas
Copy link
Contributor Author

Sorry about that, I'll push an update shortly

@dirk-thomas
Copy link
Contributor

I already added the doc lines in the referenced commit.

@mikaelarguedas
Copy link
Contributor Author

Yeah I meant the other files that got SKIP_TEST argument added. See bf69fdd

@dirk-thomas
Copy link
Contributor

I just added them to the existing PR: 955f2df

@mikaelarguedas
Copy link
Contributor Author

great thanks, deleting the other branch then

@dirk-thomas
Copy link
Contributor

Thanks, sorry for the overlap 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants