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

Merge 'generate_reference_path' and 'reference_path' in integration tests (bug #672) #715

Merged
merged 4 commits into from
Apr 5, 2018

Conversation

rinklejain
Copy link
Contributor

@rinklejain rinklejain commented Mar 13, 2017

When --generate-references argument is used then path specified in generate_reference is used to generate reference data otherwise path of directory already containing the reference data is specified in reference. So instead of two fields, they are merged into one.

  • tests/integration_tests/conftest.py: merged gen_ref_path and reference_filepath to reference_filepath.
  • tests/integration_tests/test_integration.py: changes made in test file to comply with changes in conftest.py
  • docs/integration.yml: updated doc as there is only one field required rather than reference and generate_reference

'gen_ref_path': os.path.join(os.path.expandvars(os.path.expanduser(
integration_tests_config['generate_reference'])), tardis_githash[:7]
),
'reference_filepath': ref_path,
Copy link

Choose a reason for hiding this comment

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

You might want to think of another name here, because when you generate references, it would be like:
path/as/mentioned/in/yml/githash which is not "filepath" per se.

Copy link

Choose a reason for hiding this comment

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

/ping: @yeganer. Rest all of it looks logically correct to me. Please verify it once 🚀

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure. I'll make the necessary changes.

@unoebauer
Copy link
Contributor

@wkerzendorf, @yeganer - can we merge this?

@unoebauer unoebauer added this to the v2.0 milestone Apr 5, 2018
@wkerzendorf wkerzendorf merged commit 38ac354 into tardis-sn:master Apr 5, 2018
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.

4 participants