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

Recurse kwarg of state.directory state shall be a list or None #53295

Merged
merged 5 commits into from Jun 27, 2019

Conversation

@DmitryKuzmenko
Copy link
Contributor

commented May 29, 2019

What does this PR do?

Fixes the test integration.states.test_file.FileTest.test_directory_broken_symlink

The state.directory function documentation says it accepts a list of strings but tests pass a set of strings that results to a test failure.

What issues does this PR fix or reference?

#53283

Previous Behavior

Traceback (most recent call last):
  File "/tmp/kitchen/testing/tests/integration/states/test_file.py", line 1271, in test_directory_broken_symlink
    file_mode=644, dir_mode=755)
  File "/tmp/kitchen/testing/tests/support/case.py", line 840, in run_state
    ret = self.run_function('state.single', [function], **kwargs)
  File "/tmp/kitchen/testing/tests/support/case.py", line 814, in run_function
    kwarg=kwargs)
  File "/tmp/kitchen/testing/salt/client/__init__.py", line 703, in cmd
    **kwargs)
  File "/tmp/kitchen/testing/salt/client/__init__.py", line 349, in run_job
    raise SaltClientError(general_exception)
SaltClientError: can not serialize 'set' object

New Behavior

Test passes.

Tests written?

A test fix.

Commits signed with GPG?

Yes

@DmitryKuzmenko DmitryKuzmenko changed the title Recurse kwarg of state.directory state shall be a list of None Recurse kwarg of state.directory state shall be a list or None May 29, 2019
@Ch3LL Ch3LL requested a review from twangboy Jun 18, 2019
@twangboy

This comment has been minimized.

Copy link
Contributor

commented Jun 25, 2019

The lint failures are in the kubernetes module....

@DmitryKuzmenko

This comment has been minimized.

Copy link
Contributor Author

commented Jun 25, 2019

@twangboy sorry not sure what lint errors you're talking about.

@twangboy

This comment has been minimized.

Copy link
Contributor

commented Jun 25, 2019

@DmitryKuzmenko I made that comment before I updated the branch. The lint test is passing now.

@dwoz
dwoz approved these changes Jun 27, 2019
@dwoz dwoz added the 2019.2.1 label Jun 27, 2019
@s0undt3ch

This comment has been minimized.

Copy link
Member

commented Jun 27, 2019

Closes #53350

@Akm0d
Akm0d approved these changes Jun 27, 2019
@dwoz dwoz merged commit 14efced into saltstack:2019.2.1 Jun 27, 2019
26 of 35 checks passed
26 of 35 checks passed
ci/py2/ubuntu1604 (ignore-me-new-jenkins) This commit cannot be built
Details
ci/py3/fedora29 (ignore-me-new-jenkins) This commit cannot be built
Details
ci/py3/ubuntu1604 (ignore-me-new-jenkins) This commit cannot be built
Details
ci/py3/ubuntu1804 (ignore-me-new-jenkins) This commit cannot be built
Details
continuous-integration/jenkins/pr-head This commit cannot be built
Details
jenkins/pr/py3-fedora-29 The py3-fedora-29 job has failed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has failed
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP Ready for review
Details
ci/docs (ignore-me-new-jenkins) This commit looks good
Details
ci/lint (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/centos6 (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/centos7 (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/debian8 (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/debian9 (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/fedora29 (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/ubuntu1804 (ignore-me-new-jenkins) This commit looks good
Details
ci/py2/windows2016 (ignore-me-new-jenkins) This commit looks good
Details
ci/py3/centos7 (ignore-me-new-jenkins) This commit looks good
Details
ci/py3/debian9 (ignore-me-new-jenkins) This commit looks good
Details
ci/py3/windows2016 (ignore-me-new-jenkins) This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint test passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-fedora-29 The py2-fedora-29 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.