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

Fix failing prepend test #48564

Merged
merged 1 commit into from Jul 13, 2018

Conversation

Projects
None yet
2 participants
@dwoz
Contributor

dwoz commented Jul 13, 2018

The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.

Tests written?

No

Commits signed with GPG?

Yes

Fix failing prepend test
The prepend test is failing when jenkins runs kithchen but is passing in
my test environment. Make sure each test starts without the 'etc' path
existing.

@dwoz dwoz requested a review from gtmanfred Jul 13, 2018

@gtmanfred

Just one question

def tearDown(self):
remove_dir = '/etc'
if salt.utils.is_windows():
remove_dir = 'c:\\etc'

This comment has been minimized.

@gtmanfred

gtmanfred Jul 13, 2018

Contributor

This could be one line

@@ -1174,6 +1183,7 @@ def test_prepend(self):
'''
Test to ensure that some text appears at the beginning of a file.
'''

This comment has been minimized.

@gtmanfred

gtmanfred Jul 13, 2018

Contributor

Does this work on linux?

This comment has been minimized.

@dwoz

dwoz Jul 13, 2018

Contributor

good catch.

This comment has been minimized.

@gtmanfred

gtmanfred Jul 13, 2018

Contributor

The tests looked like they passed, so I merged it.

This comment has been minimized.

@dwoz

dwoz Jul 13, 2018

Contributor

Oh, right. They would pass because 'c:\etc' wont ever exist on linux. It's still buggy though so I'll clean it up in another PR (after making sure test_prepend actually passes now).

@gtmanfred gtmanfred merged commit 13f6733 into saltstack:2017.7 Jul 13, 2018

9 of 16 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6425 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24353 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11395 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20478 — FAILURE
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26640 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18670 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23306 — SUCCESS
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment