valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
62,302 Commits 24 Branches 182 Tags 341 MiB
56b1f6c651
Commit Graph

6108 Commits

Author SHA1 Message Date
Eu
56b1f6c651 Fix naive fileserver map diff algorithm 
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
 2016-07-27 13:24:19 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout 
SSH timeout
 2016-07-27 11:24:37 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976) 
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
 2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869) 
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
 2016-07-22 09:04:05 -06:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -06:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
Mike Place
46901c6e65 Disable test 
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
 2016-07-18 12:39:49 -06:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -06:00
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Justin Anderson
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04:00
Justin Anderson
34bcf9ccfc Changed network state test to use test=True 2016-07-12 12:40:40 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
rallytime
ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test 
These tests are not getting run automatically in a ./runtests.py -u
or on Jenkins runs. This name changes allows them to run automatically.
 2016-07-07 17:12:27 -06:00
Mike Place
6b8c76af83 Prevent many errors in the test suite in loader tests (#34521) 
Pack in what the loader needs.
 2016-07-07 17:03:45 -04:00
Mike Place
685df80929 Merge pull request #34518 from terminalmage/fix-pkg.latest-test 
Fix pkg.latest integration test for non-LTS ubuntu
 2016-07-07 13:29:13 -06:00
Justin Anderson
ed59113e94 Change network state integration test to use test=True 2016-07-07 12:27:18 -06:00
Erik Johnson
4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu 
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.
 2016-07-07 12:51:01 -05:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
rallytime
55a91e22be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-05 09:13:50 -06:00
Mike Place
8c72ee56e4 Merge pull request #34435 from cachedout/backport_config_dir_integration 
Backport change to integraiton test suite
 2016-07-05 08:24:53 -06:00
Mike Place
0e2c71a537 Backport change to integraiton test suite 
Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
 2016-07-01 16:10:34 -06:00
Mike Place
45b8fb10d7 Merge pull request #34373 from jtand/network_state_integration_test 
Network state integration test
 2016-06-30 08:05:44 -07:00
Erik Johnson
d6af1de0b7 Optimize pkg integration tests and add a couple new tests (#34377) 
* Remove redundant usage of destructiveTest decorator

* Remove unnecessary SLS file

This simple state can be run using run_state

* Explicitly order tests

* Use run_state instead of invoking state.sls

* Ensure only one refresh_db done during pkg integration tests

* Add pkg.latest test for package without an epoch

* Optimize pkg.latest_version usage in pkg integration tests

* Clarify outcome when only_upgrade is used

* Add pkg.latest test with only_upgrade=True
 2016-06-30 10:48:22 -04:00
Justin Anderson
1d24053e36 network.system sls file 2016-06-29 14:31:46 -06:00
Justin Anderson
4a9e6af542 network.routes sls file 2016-06-29 14:31:07 -06:00
Justin Anderson
76c90b2ef6 network.managed sls file 2016-06-29 14:30:23 -06:00
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -06:00
Nicole Thomas
94e094652c Back-port #34324 to 2015.8 (#34344) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 16:35:32 -04:00
Erik Johnson
f6bd1ad47e Revert py3modernize lint changes (#34339) 
* salt/__init__.py: revert py3modernize lint changes

* salt/cloud/clouds/vmware.py: revert py3modernize lint changes

* salt/modules/jboss7_cli.py: revert py3modernize lint changes

* salt/payload.py: revert py3modernize lint changes

* salt/serializers/yamlex.py: revert py3modernize lint changes

* salt/states/win_servermanager.py: use absolute imports

* salt/utils/args.py: revert py3modernize lint changes

* salt/utils/decorators/__init__.py: use __name__ instead of func_name

__name__ is py3-compatible and also works on builtins in py2, which
func_name does not.

* salt/utils/compat.py: revert py3modernize lint changes

* salt/utils/__init__.py: revert py3modernize lint changes

* salt/version.py: revert py3modernize lint changes

* tests/salt-tcpdump.py: revert py3modernize lint changes
 2016-06-28 16:04:02 -04:00
Mike Place
046bdaa9f2 Merge pull request #34306 from ghedo/iptables_flush_table 
Fix iptables.flush state: Do not force 'filter' table when flushing
 2016-06-28 12:03:14 -07:00
Erik Johnson
b793426c23 Remove unnecessarily-disabled sanity check (#34325) 
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd. Uncommenting this sanity check so that we are
notified if we need to update our targets in the future.
 2016-06-28 11:12:55 -04:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing 
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
 2016-06-28 15:40:50 +01:00
Mike Place
65c5675a3f Merge pull request #34257 from rallytime/fix-34037 
Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
 2016-06-24 10:25:04 -07:00
rallytime
d7a5e9b10e Remove test that doesn't actually test anything 2016-06-24 09:10:13 -06:00
Mike Place
cb5399787c Merge pull request #34136 from meaksh/salt-suse-os-detection-2015.8 
Fixed behavior for SUSE OS grains in 2015.8
 2016-06-23 13:24:58 -07:00