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

[_6169] updates for metaclass, test generation (4-2-stable) #6206

Merged
merged 2 commits into from
Mar 2, 2022

Conversation

d-w-moore
Copy link
Contributor

Use the six module's portable metaclass syntax (instead of __metaclass__ which won't work starting in Python3). More importantly we use -r in irule invocations to guarantee a nonzero rule code causes the tests generated from rule file directories to return the appropriate pass / fail status to the testing framework. We target:

@d-w-moore d-w-moore changed the title [_6169] updates for metaclass, test generation [_6169] updates for metaclass, test generation (4-2-stable) Feb 28, 2022
@trel
Copy link
Member

trel commented Feb 28, 2022

this seems fine for now - using six for 4-2-stable is good/necessary.

eventually test_all_rules.py can get refactored / go away / be absorbed by the other test suites.

@trel
Copy link
Member

trel commented Feb 28, 2022

so yes, please # it.

@@ -236,6 +236,7 @@ def filter_rulefiles(rulefile):
"rulemsiSysReplDataObj",
"rulemsiNoChkFilePathPerm",
"rulemsiNoTrashCan",
"rulemsiSetRescSortScheme.r",
Copy link
Member

Choose a reason for hiding this comment

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

no .r ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops , ... right. Hmph.

@d-w-moore
Copy link
Contributor Author

d-w-moore commented Feb 28, 2022

Uhm.... actually, there is an extra commit where incomplete tests are skipped. (Existed on main but not here, until my force push just now - but that's how it was tested.) Sorry about that. If that's cool , then I'll go ahead and # as requested.

@trel
Copy link
Member

trel commented Feb 28, 2022

squash it all down, get it running cleanly, and then # it. yes please.

@d-w-moore
Copy link
Contributor Author

I'll test again with the .r taken out then.... on both branches.

@d-w-moore
Copy link
Contributor Author

wait til irods/irods_client_icommands#277 is #'d and approved, then merge together with this

@trel trel merged commit 030023f into irods:4-2-stable Mar 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants