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

Enhance file template defaulting behavior #77

Merged
merged 1 commit into from Aug 25, 2018
Merged

Enhance file template defaulting behavior #77

merged 1 commit into from Aug 25, 2018

Conversation

timj
Copy link
Member

@timj timj commented Aug 24, 2018

  • Allow explicit disabling of default value
  • Extra tests

I don't think this interacts with #59 (which I see just merged so I'll rebase).

@timj timj requested a review from TallJimbo August 24, 2018 18:53
Copy link
Member

@TallJimbo TallJimbo left a comment

Choose a reason for hiding this comment

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

One guess at an incompatibility with DM-15189 that you may have already discovered while rebasing. Otherwise looks good.

default = "{datasetType}/{filter}"
templates = FileTemplates(config3, default=default)
tmpl = templates.getTemplate(ref2.datasetType.name)
self.assertEqual(tmpl.template, default)
Copy link
Member

Choose a reason for hiding this comment

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

This probably will interact with DM-15189, because a template without {run} or {collection} is now invalid.

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't ever expand the template in these tests so it's not a problem. The only conflict was in the import line.

* Allow explicit disabling of default value
* Extra tests
@timj timj merged commit de6ace3 into master Aug 25, 2018
@timj timj deleted the tickets/DM-15529 branch August 25, 2018 04:05
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