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

add mock for status.uptime unit test #37158

Merged
merged 1 commit into from
Oct 24, 2016

Conversation

jfindlay
Copy link
Contributor

@jfindlay jfindlay commented Oct 21, 2016

What does this PR do?

Fix the intermittent stack trace from the status.uptime unit test on macOS.

Traceback (most recent call last):
  File "/testing/tests/unit/modules/status_test.py", line 45, in test_uptime
    u_time = status.uptime()
  File "/testing/salt/utils/decorators/__init__.py", line 579, in _decorate
    return self._call_function(kwargs)
  File "/testing/salt/utils/decorators/__init__.py", line 314, in _call_function
    raise error
CommandExecutionError: This platform is not supported

What issues does this PR fix or reference?

#37157. @rallytime, this change should not be included in a merge to develop if/when #37157 is merged.

Tests written?

Yes

@jfindlay jfindlay changed the title Skip status.uptime test on macOS until Nitrogen add mock for status.uptime unit test Oct 21, 2016
@cachedout cachedout merged commit c5d81a8 into saltstack:2016.3 Oct 24, 2016
@jfindlay jfindlay deleted the mac_skip_uptime branch October 27, 2016 16:28
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