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

Fix incorrectly written test #34000

Merged
merged 1 commit into from
Jun 14, 2016
Merged

Conversation

cachedout
Copy link
Contributor

Modified to use the correct method for generating a new copy of opts inside an integration test.

This should be using the test suite method of generating opts
@rallytime rallytime merged commit f758e42 into saltstack:2015.5 Jun 14, 2016
rallytime pushed a commit to rallytime/salt that referenced this pull request Jun 14, 2016
@rallytime rallytime mentioned this pull request Jun 14, 2016
rallytime pushed a commit that referenced this pull request Jun 14, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 19, 2016
* upstream/develop: (67 commits)
  Change 'Suse' to 'SUSE' in inspect_collector_test
  Add a test to check for disconnected minion messaging
  Fixes doc refresh bug on chrome mobile.
  Fixed a bug in the consul.py module that was preventing services (saltstack#34051)
  Back-port saltstack#34026 to 2016.3 (saltstack#34050)
  Ensure only one fileserver update in a masterless run
  Updated latest release version
  Always make changes to minion config if set (saltstack#34020)
  More YAML indentation fixes in state module examples (saltstack#34030)
  Warn when custom returners don't have minions kwarg in save_load
  Add note to release notes about returner minions kwarg change
  Fix loop over cache in auth checking!
  Save an entire minion cache traversal on each master pub
  Do not cache remote files if they are already cached
  Warn when custom returners don't have minions kwarg in save_load
  Add note to release notes about returner minions kwarg change
  Fix loop over cache in auth checking!
  Save an entire minion cache traversal on each master pub
  states.file: fix indentation in YAML examples (saltstack#34003)
  Lint fix for saltstack#34000 (saltstack#34005)
  ...
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