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 remaining file state integration tests (py3) #49167

Merged
merged 2 commits into from Aug 17, 2018

Conversation

Projects
None yet
3 participants
@dwoz
Contributor

dwoz commented Aug 17, 2018

What does this PR do?

Fix remaining file state integration tests (py3)

Tests written?

No - Fixing tests

Commits signed with GPG?

Yes

@dwoz dwoz requested a review from gtmanfred Aug 17, 2018

@gtmanfred

These should have been removed when we fixed all the other keys stuff,if you just pass a dict to list,it will give you back the keys

@@ -267,7 +267,7 @@ def test_managed_file_mode(self):
if IS_WINDOWS:
expected = 'The \'mode\' option is not supported on Windows'
self.assertEqual(ret[ret.keys()[0]]['comment'], expected)
self.assertEqual(ret[list(ret.keys())[0]]['comment'], expected)

This comment has been minimized.

@gtmanfred

gtmanfred Aug 17, 2018

Contributor

Just call list here,no reason for .keys

@dwoz dwoz force-pushed the dwoz:filefix branch from ae6c347 to 261b178 Aug 17, 2018

@dwoz dwoz force-pushed the dwoz:filefix branch from 261b178 to b5ba073 Aug 17, 2018

@gtmanfred gtmanfred merged commit 8ab55f5 into saltstack:2017.7 Aug 17, 2018

8 checks passed

WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
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/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

dwoz added a commit that referenced this pull request Aug 17, 2018

dwoz added a commit to dwoz/salt that referenced this pull request Aug 17, 2018

Merge pull request saltstack#49167 from dwoz/filefix
Fix remaining file state integration tests (py3)

@dwoz dwoz deleted the dwoz:filefix branch Aug 21, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment