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

remove base_top_file file in teardown and add sleep #48899

Merged
merged 2 commits into from Aug 5, 2018

Conversation

Projects
None yet
3 participants
@Ch3LL
Contributor

Ch3LL commented Aug 2, 2018

What does this PR do?

These tests:

unit.modules.test_state.TopFileMergingCase.test_merge_strategy_merge_limited_base
unit.modules.test_state.TopFileMergingCase.test_merge_strategy_merge_state_top_saltenv_base
unit.modules.test_state.TopFileMergingCase.test_merge_strategy_same_limited_base

are failing on macosx for the same reasons outline in:
#48890

adding the time.sleep() to ensure the mtime on the files are not the same in between tests and we don't use the cached file. Also making sure we remove the base_top_file file between tests.

@rallytime rallytime merged commit dbd300f into saltstack:2018.3 Aug 5, 2018

6 of 8 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment