[2016.3] Merge forward from 2015.8 to 2016.3 #34553
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This test uses ``pkg.list_upgrades`` to find a package which it assumes is installed, to test ``pkg.installed`` with ``only_upgrade=True``. The problem with that approach is that ``pkg.list_upgrades`` uses a dry-run of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu releases, a ``dist-upgrade`` results in upgrading to an entirely new Ubuntu release, and new packages which would be installed by the dist-upgrade (but are not currently installed) will be included in the return data. This causes the test to fail when we attempt to run ``pkg.latest`` with ``only_upgrade=True`` on a package which is not already installed. This commit fixes the test by ensuring that our target package is already installed, and continuing to iterate through the return data from ``pkg.list_upgrades`` until a currently-installed package is found.
Fix pkg.latest integration test for non-LTS ubuntu
The name of retention policy and database were reversed, so SaltStack was using rp name as database, so it returns "database does not exist"
Pack in what the loader needs.
Version 2016.07.07
These tests are not getting run automatically in a ./runtests.py -u or on Jenkins runs. This name changes allows them to run automatically.
Rename tests.unit.simple to tests.unit.simple_test
…p-test Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test
No conflicts.
|
Go Go Jenkins! |
1 similar comment
|
Go Go Jenkins! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No conflicts.