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

Unbreak timezone test for Gentoo #32420

Merged
merged 1 commit into from Apr 7, 2016
Merged

Unbreak timezone test for Gentoo #32420

merged 1 commit into from Apr 7, 2016

Conversation

eradman
Copy link
Contributor

@eradman eradman commented Apr 7, 2016

What does this PR do?

Fixes unit.modules.timezone_test.TimezoneTestCase.test_get_zone

Previous Behavior

self.assertEqual(timezone.get_zone(), '') 
    AssertionError: '#\nA' != ''   

Gentoo and Debian both use use /etc/timezone
See https://wiki.gentoo.org/wiki/System_time
@cachedout cachedout merged commit b220b4d into saltstack:develop Apr 7, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Apr 7, 2016
* commit '90b0a42a21dc11ca118ffbb679e0871f234c17bc':
  Unbreak cron.file (saltstack#32396)
  Unbreak timezone test for Gentoo (saltstack#32420)
justinta pushed a commit to justinta/salt that referenced this pull request Apr 7, 2016
rallytime pushed a commit that referenced this pull request Apr 8, 2016
Fix issue that #32420 exposed in timezone_test
gitebra pushed a commit to gitebra/salt that referenced this pull request Apr 8, 2016
* upstream/develop:
  Skip PAM test on OpenBSD (saltstack#32439)
  Do not assume temporary files have the user's gid
  Fix issue that saltstack#32420 exposed in timezone_test
@eradman eradman deleted the timezone_test branch April 8, 2016 22:04
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.

None yet

2 participants