valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,375 Commits 24 Branches 182 Tags 341 MiB
336fbb03bc
Commit Graph

4104 Commits

Author SHA1 Message Date
rallytime
34300847ec Fix test failures 2016-03-24 09:48:54 -06:00
rallytime
6b92ef1924 Add mac_desktop integration tests 
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
 2016-03-23 17:31:41 -06:00
rallytime
a333210a08 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/rabbitmq.py
  - salt/states/rabbitmq_user.py
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 16:10:31 -06:00
Brian Stevenson
1500aae027 set deleted value to list 2016-03-23 13:47:12 -07:00
Brian Stevenson
1dc8f5f289 unit test update 
grain value looks for list in assertion
 2016-03-23 10:50:32 -07:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
 2016-03-23 10:56:25 -06:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests 
Mac assistive tests
 2016-03-23 09:51:36 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl 
Bring back localectl parsing in locale module for when dbus module is unavailable
 2016-03-23 09:47:27 -06:00
Nicole Thomas
37c410fee4 Merge pull request #32079 from rallytime/merge-32041 
Merge #32041 with test removal
 2016-03-23 09:42:35 -06:00
rallytime
b13fdc1831 Remove useless tests 2016-03-23 08:49:52 -06:00
Stefan Schweer
1ee6e7b04f replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
 2016-03-23 11:55:27 +01:00
Justin Anderson
df9abd5021 Skipped test if zeromq is not transport 2016-03-22 16:01:18 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix 
Make sure there are no connection object cache hits on boto_* unit te…
 2016-03-22 14:38:46 -06:00
rallytime
b1bdb688ae Add unit tests for new remove function, too. 2016-03-22 14:25:49 -06:00
rallytime
88ba210f86 Add mac_assistive integration tests 
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
 2016-03-22 14:11:40 -06:00
twangboy
158ebc76b8 Fix unit tests for mac_utils 2016-03-22 13:46:19 -06:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
Stefan Schweer
d317f7134f replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
 2016-03-22 18:01:57 +01:00
Stefan Schweer
bac08b24ec replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
 2016-03-22 18:00:33 +01:00
Andreas Lutro
46018e4535 update kapacitor tests 2016-03-22 15:10:46 +01:00
Kris Raney
b4889024c5 Merge branch 'develop' into kraney_bugfix 2016-03-22 09:05:58 -05:00
Yaroslav Molocko
5312b87e20 k8s secrets and namespaces management 2016-03-22 14:21:11 +08:00
twangboy
7daf9d8277 Remove unit tests without logic 2016-03-21 17:47:34 -06:00
twangboy
5658753a5f Add already installed check 2016-03-21 17:33:25 -06:00
twangboy
933e275b3a Add integration tests 2016-03-21 15:03:31 -06:00
Andreas Lutro
a31cdf1968 Fix and improve locale module for systemd 
- parse localectl output when dbus module is unavailable
- use dbus/localectl whenever the system is detected to have been booted
  with systemd as the init system, regardless of os grain
- simplify and improve logic when parsing dbus/localectl
  - don't rely on exceptions to find the end of the locale params
  - make sure that all locale params get returned
 2016-03-21 20:22:16 +01:00
twangboy
100bcefa60 Fix unit tests 2016-03-21 12:15:08 -06:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed. 
fixes #32013
 2016-03-21 10:44:22 +01:00
rallytime
37dee42061 Pylint fixes 2016-03-18 16:27:06 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
rallytime
4768bfafc6 Disable boto tests that are failing on develop 2016-03-18 14:02:06 -06:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
rallytime
b2f3cc080f Disable more boto test classes that kill the test suite 2016-03-18 13:04:34 -06:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
Kris Raney
890648aca0 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-17 15:07:43 -05:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Nicole Thomas
03e8b72655 Merge pull request #31904 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-16 11:23:54 -06:00
Mike Place
854d34aa30 Merge pull request #31626 from isbm/isbm-md5-to-sha1-dev 
Use SHA256 instead of MD5 (develop branch)
 2016-03-16 10:14:28 -06:00
Mike Place
b068eaa963 Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix 
Fix the always-false behavior on checking state
 2016-03-15 17:02:19 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable 
Hotfix/windows proxy enable
 2016-03-15 12:58:33 -06:00
Daniel Hobley
415cc8efab Make sure we enable the proxy settings on windows 2016-03-15 12:02:12 +01:00
Mike Place
8e540af197 Remove useless mine tests 
These are so heavily mocked that they test nothing.
 2016-03-14 11:35:42 -06:00
Daniel Hobley
55f7ab1fba Fixed a bug where a cert was not correctly updated 
If the certificate supplied had a different hash than the previous but the name was the same the change was ignored, this commit fixes that.
 2016-03-11 11:52:15 -06:00
Nicole Thomas
cce0af9a2e Merge pull request #31792 from kraney/boto_elasticsearch 
Add boto_elasticsearch_domain module
 2016-03-11 08:57:27 -07:00
Christophe Drevet-Droguet
dcd6f5a5a9 test for file.apply_template_on_contents 2016-03-11 12:44:26 +01:00
Kris Raney
b0f0601bfc More pylint fun 2016-03-10 21:02:06 -06:00
Kris Raney
3bcca37d80 Ah, pylint. Equal parts useful and annoying. 2016-03-10 20:57:03 -06:00
Kris Raney
70b9860b1a Fix pylint, doctstring, and tests in the case that boto3 is not installed 2016-03-10 17:09:52 -06:00
Kris Raney
15675c78c8 Add boto3 requirement to boto_vpc unit tests 2016-03-10 17:03:10 -06:00
Kris Raney
4161a7e789 Merge branch 'develop' into boto_vpc 2016-03-10 17:02:08 -06:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
 2016-03-10 13:13:35 -07:00
Nicole Thomas
4e0b44a1bb Merge pull request #31795 from rallytime/lint-31761 
Merge #31761 with lint fix
 2016-03-10 11:01:25 -07:00
Justin Findlay
e46bac2d98 transport.tcp unit tests: disable hanging tests 2016-03-10 10:57:21 -07:00
Justin Findlay
992a8af726 renderers.gpg unit tests: mock gpg command 2016-03-10 10:57:21 -07:00
Justin Findlay
08493d85fd states.file unit tests: mark tests destructive for touching file 2016-03-10 10:57:20 -07:00
Justin Findlay
7a8061cc1e states.file unit tests: use existing file for unmocked tests 2016-03-10 10:57:20 -07:00
Justin Findlay
fe2fd3f993 modules.ps unit tests: check ps __virtual__ 2016-03-10 10:57:20 -07:00
Justin Findlay
eb2964d517 modules.mount unit tests: mock /etc/fstab 2016-03-10 10:57:20 -07:00
Justin Findlay
328d058f22 modules.linux_sysctl unit tests: mock ctl presence 2016-03-10 10:57:20 -07:00
Justin Findlay
590c0ad986 modules.btrfs unit tests: mock /proc/mounts 2016-03-10 10:57:20 -07:00
Justin Findlay
424a8b11bd modules.pw_group: mock (BSD) test to run on MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
0098c1c554 modules.blockdev test: mock utils.which 2016-03-10 10:57:19 -07:00
Kris Raney
bae454625f Add boto_elasticsearch_domain module 2016-03-10 09:55:56 -06:00
Bo Maryniuk
ee1a002673 Update test case to cover SLE11 and SLE12 2016-03-10 13:26:15 +01:00
Bo Maryniuk
4b134fb2ab Add SLE11 product info snapshot, rename previous 2016-03-10 13:25:53 +01:00
Kris Raney
4611a9c570 Merge branch 'develop' into boto_vpc 
Conflicts:
	salt/modules/boto_vpc.py
	salt/states/boto_vpc.py
 2016-03-09 18:58:11 -06:00
Daniel Hobley
14ddae0aa8 Fixed installing keychain certificates from salt fileserver 2016-03-09 18:16:47 -06:00
Andreas Lutro
170742f861 update tests with new changes structure 2016-03-09 19:16:40 +01:00
rallytime
46d29e7594 Fix daemons test logger --> log references 2016-03-09 10:51:07 -07:00
Andreas Lutro
1f90583ee8 tweak behaviour and add tests for kapacitor 2016-03-09 08:15:58 +01:00
Bo Maryniuk
1882e1c960 Adjust test 2016-03-08 20:08:18 +01:00
Kris Raney
4809e09f52 Fix pylint errors 2016-03-08 11:54:03 -06:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
rallytime
7476076ea3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/memusage.py
 2016-03-07 14:13:14 -07:00
Mike Place
826fea6582 Merge pull request #31162 from isbm/isbm-md5-to-sha1 
Remove MD5 digest from everywhere and default to SHA256
 2016-03-07 12:11:36 -07:00
Mike Place
24568b1a5d Merge pull request #31711 from ticosax/fix-port-and-volume-discovery 
[dockerng] Port and Volume comparison should consider Dockerfile
 2016-03-07 11:25:19 -07:00
Kris Raney
3487f55e83 Add NAT Gateway support to boto_vpc 2016-03-07 09:41:03 -06:00
Mike Place
604eb87e82 Merge pull request #31713 from ticosax/fix-dockerng-networking-container_id 
[dockerng] Fix dockerng.network_present when container is given by name
 2016-03-07 08:14:41 -07:00
Nicolas Delaby
3837cf44ca Fix network_present by dealing with containers ID's instead of names. 
Because docker inspect network returns attached containers by their Ids.
 2016-03-07 10:30:58 +01:00
Nicolas Delaby
cf38691597 Port and Volume comparison should consider Dockerfile 
`EXPOSE` and `VOLUME` declaration of a Dockerfile are exactly like
user declaration those parameters in their sls for dockerng.running

Considering Dockerfile containing this line:

```
EXPOSE 80
```

Those 2 sls are now considered strictly equivalent.

```yaml
container:
    dockerng.running:
      image: alpine
      ports:
        - 80/tcp
```

```yaml
container:
    dockerng.running:
      image: alpine
```
 2016-03-07 10:11:52 +01:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
 2016-03-06 10:59:46 -07:00
twangboy
75546eadaf Fix tests for mac_utils 2016-03-04 16:36:02 -07:00
Mike Place
8b00513ebb Removed useless tests 
These test nothing and break everytime the underlying implementation is changed.
 2016-03-04 15:37:49 -07:00
rallytime
4e88ffe3e4 Lint and change version added for #31673 
Merges #31673
 2016-03-04 15:02:19 -07:00
twangboy
6cf7a4b364 Add missing import 2016-03-04 10:55:23 -07:00
twangboy
5d6de86a25 Fix some lint 2016-03-04 10:53:11 -07:00
twangboy
88d5db9cdd Add tests for remaining functions 2016-03-04 10:53:11 -07:00
twangboy
69aa8f8cbf Add test for execute_return_success 2016-03-04 10:53:11 -07:00
Christophe Drevet-Droguet
12db98ea23 grains.get ordered parameter implementation 2016-03-04 09:19:30 +01:00
Bo Maryniuk
9d64abed0c Fix PyLint 2016-03-03 21:44:14 +01:00
Bo Maryniuk
327ea11139 Add daemons unit test to verify hash_type settings 2016-03-03 21:44:14 +01:00
twangboy
e953d34492 Add back skipIf decorator 2016-03-03 10:45:57 -07:00
Mike Place
78c89d22f5 Merge pull request #31637 from kraney/boto_cognitoidentity 
pool_absent when the given pool name does not exist should return Tru…
 2016-03-03 09:45:34 -07:00
twangboy
2c4c81f55d Remove mock tests, only test _validate_minutes 2016-03-03 08:54:03 -07:00
twangboy
c181e9fcc5 Merge branch '2016.3' of https://github.com/saltstack/salt into mac_power_tests 2016-03-03 08:52:51 -07:00
Christophe Drevet-Droguet
fc9dd356e8 test case: test_list_present_nested_already 2016-03-03 15:17:43 +01:00
Bo Maryniuk
c8908dff7c Fix tests 2016-03-03 10:18:20 +01:00
Bo Maryniuk
b821e29ea9 Add daemons test 2016-03-03 10:18:20 +01:00
Mike Place
bf4b651319 Merge pull request #31633 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-02 15:09:36 -07:00
Winston Liu
a39d0d4312 pool_absent when the given pool name does not exist should return True instead of False. 2016-03-02 13:30:40 -08:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
ac69e4bf10 Fix merge bug caught by zypper test and user correct zypper test info 2016-03-02 12:19:47 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
twangboy
33da2c613e Add tests for the remainder of the functions 2016-03-02 10:20:00 -07:00
Justin Findlay
cbb28492a3 modules.mac_power: add unit tests 2016-03-01 12:19:04 -07:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
kstreee
1c9e05249f [saltstack/salt#31534] Resolve data['arg'] type issue. Now rest_tornado can accept not only a list of string type for 'arg', but also a string type data for 'arg'. 2016-03-01 01:53:30 +00:00
Mike Place
a0986739a7 Merge pull request #31505 from anonymouzz/develop 
slack module: add slack incoming webhook support.
 2016-02-26 08:29:10 -07:00
Michael Calmer
1425c6496c use specialized assert functions for tests 2016-02-26 13:54:15 +01:00
Michael Calmer
f266cfdaac test _zypper_check_result() 2016-02-26 13:54:15 +01:00
Michael Calmer
aff6467782 adapt tests to new zypper_check_result() output 2016-02-26 13:54:14 +01:00
Mikhail Sokolov
1535dceddd slack module: add slack incomming webhook suport. 2016-02-26 14:41:23 +07:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
rallytime
a41ce26287 Actually mock cmd.run_all call... 2016-02-25 15:11:25 -07:00
rallytime
e8f5f9b67a Fix zypper_test: Zypper function uses cmd.run_all, not cmd.run in 2016.3 2016-02-25 14:23:36 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
hlub
1494c44918 Refactored GlusterFS support 
Usage of GlusterFS states did not change except the state 'created' was deprecated in favor of more descriptive name 'volume_present'.
- Improved separation of functionality in the execution module from the states. Module functions now return booleans instead of varying
strings. Parsing those strings in the states was very error-prone. In glusterfs.peer() function this problem was earlier solved by returning
a dict containing both the exit value and output string of the gluster call. This could be a good idea, although without calling the gluster
calls twice, and applied to other functios too.
- Calls to gluster are now logged more verbosely, while a failing call no longer raises an immediate exception.
- Improved checking and verbosity in the state level. Cleaned code a lot, removed some bugs and other odd behaviour.
- Updated tests to match the changes. Refactored some test code to be more readable. Added assertions to test that some functions are not
called when things are already in the desired state. Preferred changing behaviour of the mocked functions while proceeding instead of listing
all of the return values first.
- Replaced glusterfs.list_peers() with more informative peer_status() and deprecated the old name. The function now returns a dict with UUIDs as its keys.
- glusterfs.info() can now be called without volume name. It always returns a dictionary. Use this function instead of status() in sates.
- Functions glusterfs.delete() and glusterfs.create() were deprecated and renamed to delete_volume() and create_volume().
 2016-02-25 10:46:43 -07:00
Bo Maryniuk
d30f2e4627 Implement unit test for remove and purge 2016-02-25 17:48:03 +01:00
Mike Place
e483978fc8 Merge pull request #31423 from twangboy/win_system_dev 
Fix uppercase computer names
 2016-02-25 09:15:58 -07:00
Bo Maryniuk
bc05acf7c3 Fix PyLint 2016-02-25 14:00:12 +01:00
Erik Johnson
9da467aec7 Rename core.py to core_test.py 2016-02-24 10:15:01 -07:00
Erik Johnson
468c637032 Add unit test for core grains 2016-02-24 10:15:01 -07:00
C. R. Oldham
db7b675b09 We need one more mocked return from listdir. 2016-02-24 10:15:00 -07:00
Nicolas Delaby
d2bcc37416 Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-24 10:08:03 -07:00
Bo Maryniuk
c0eab8b549 Add space before "assert" keyword 2016-02-24 17:46:49 +01:00
Bo Maryniuk
6bcb89a8f6 Implement list packages test 2016-02-24 17:45:33 +01:00
Bo Maryniuk
78837d2926 Add mocking data 2016-02-24 17:45:23 +01:00
Bo Maryniuk
0b64b8137f Implement test for version compare, where python fall-back algorithm is called 2016-02-24 17:24:23 +01:00
Bo Maryniuk
18b30a3274 Implement test for version compare, where RPM algorithm is called 2016-02-24 17:24:05 +01:00
Bo Maryniuk
59eca53441 Adjust test case for the third package in the test static data 2016-02-24 16:06:53 +01:00
Bo Maryniuk
8034cf0b91 Add third test package static info 2016-02-24 16:06:33 +01:00
Bo Maryniuk
90f209569a Implement test for the upgrade_available 2016-02-24 15:52:18 +01:00
Bo Maryniuk
7eb5f19cb4 Implement test for latest_available 2016-02-24 14:10:07 +01:00
Bo Maryniuk
e372c0b596 Implement test for the info_available 2016-02-24 13:59:05 +01:00
Bo Maryniuk
447771c0fc Add Zypper static data for the available packages 2016-02-24 13:58:47 +01:00
Bo Maryniuk
6989871d27 Implement test for info_installed 2016-02-24 12:31:17 +01:00
Bo Maryniuk
0cc6bce4aa Use strings instead of unicode strings 2016-02-24 11:56:30 +01:00
Bo Maryniuk
3342c03987 Implement list upgrades test 2016-02-24 11:56:18 +01:00
Bo Maryniuk
8862d7af65 Add list upgrades Zypper static data 2016-02-24 11:55:59 +01:00
Bo Maryniuk
4d38d318f4 Implement error handling test for listing upgrades 2016-02-24 11:55:34 +01:00
Bo Maryniuk
53338402a5 Use renamed zypper products data file 2016-02-24 11:21:11 +01:00
Bo Maryniuk
c6135975b0 Rename Zypper products static test data file 2016-02-24 11:20:53 +01:00
Bo Maryniuk
e87864986d Add Zypper unit test: test_list_products and test_refresh_db 2016-02-23 17:35:48 +01:00
Bo Maryniuk
cd6419fc9c Add Zypper Unit Test installed products sample data 2016-02-23 17:34:37 +01:00
Mike Place
43d531b93d Merge pull request #31392 from vodik/nftables 
Changes to nftables module
 2016-02-23 09:15:01 -07:00
Mike Place
64ed9fcd01 Merge pull request #31418 from terminalmage/fix-debian-grains 
Fix core grains when Debian OS detected as 'Debian GNU/Linux'
 2016-02-23 08:49:49 -07:00
Erik Johnson
0e0cd17160 Rename core.py to core_test.py 2016-02-22 21:54:49 -06:00
twangboy
144f7206fe Fix uppercase computer names 2016-02-22 16:42:08 -07:00
Mike Place
873061e2fa Merge pull request #31422 from cachedout/remove_runit_test 
Remove useless test
 2016-02-22 16:28:01 -07:00
Mike Place
56a899c8d9 Remove useless test 
This tests absolutely nothing and has no real point.
 2016-02-22 16:26:30 -07:00
Erik Johnson
d3cd1b596d Add unit test for core grains 2016-02-22 16:37:03 -06:00
Mike Place
2bd9af38b0 Merge pull request #31329 from kraney/boto_iam 
Extend boto_iam with support for managed policies
 2016-02-22 12:28:30 -07:00
Erik Johnson
c7bd13c9c9 Merge pull request #31376 from cro/suse_service2 
Some distros don't have a /lib/systemd
 2016-02-22 12:11:39 -06:00
Kris Raney
04b3a24e78 Update unit tests to reflect changes 2016-02-22 10:58:23 -06:00
Mike Place
105821efc7 Merge pull request #31352 from ticosax/pull-image-on-running 
[dockerng] Pull missing images when calling dockerng.running
 2016-02-22 09:54:10 -07:00
rallytime
8d928ab34a Pylint fix from wierd git behavior 2016-02-22 09:24:13 -07:00
C. R. Oldham
f3fec5562e We need one more mocked return from listdir. 2016-02-21 21:55:08 -07:00
rallytime
38f89bf8fd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
 2016-02-21 15:23:24 -07:00
Simon Gomizelj
c0ac0c0096 Fix check_table 
The output of 'nft list tables' has the family included in the output
 2016-02-20 21:32:48 -05:00
rallytime
4baea26c58 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/netapi/index.rst
  - salt/modules/win_servermanager.py
  - salt/modules/zypper.py
 2016-02-20 12:27:41 -07:00
Nicolas Delaby
8c86eeb4dc Pull missing images when calling dockerng.running 
fixes #29727
 2016-02-19 15:43:52 +01:00
Ronald van Zantvoort
3110e3424f Additional fixes to test output, unit tests fixes 2016-02-19 13:11:59 +01:00
Nicolas Delaby
a8dc33a5e3 Saltnado provide also get parameters to the context 2016-02-19 09:11:15 +01:00
Mike Place
f0ba9c1eca Merge pull request #31326 from ticosax/2015.8-dockerng-detect-settings-removal 
[dockerng ] Detect settings removal
 2016-02-18 15:02:50 -07:00
Mike Place
3832f9b874 Merge pull request #30979 from dschaller/npm-cache-clean 
Adding NPM cache_cleaned state & module functions
 2016-02-18 14:51:04 -07:00
Mike Place
b40c611d0d Merge pull request #31067 from jfindlay/deprecate_env 
Deprecate env
 2016-02-18 14:42:10 -07:00
Mike Place
02f79dc2b3 Merge pull request #31322 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-02-18 14:28:02 -07:00
Nicolas Delaby
7bedd86ebe Add detection of removed settings. 
When removing settings from dockerng.running state definition,
changes where ignored as `_compare()` was iterating only over user defined
parameters.

By looping over all available options we are now sure to not miss
removed entries.

Extend definition of expected default values:

 - Some default values are predictable and hardcoded in the VALID_CREATE_OPTS dict.
 - Some default needs to be read from images (`image_path`)
 - Some defaults values are unpredictable (hostname, mac_address)
 we are comparing desired value against value reported by the container
 (`get_default_from_container`).
 2016-02-18 20:23:31 +01:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
rallytime
01aa33ac12 Merge branch '2015.8' into '2016.3' 2016-02-18 11:13:23 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Mike Place
ce5bc23431 Merge pull request #31289 from jtand/utils_network_tests 
Added some additional unit tests to unit.utils.network
 2016-02-18 09:56:18 -07:00
Erik Johnson
cf2ce95e61 Update test to reflect new position of contents param 
The addition of the new skip_verify argument to
salt.modules.file.manage_file() means that the position of contents
param in returner.call_args[0] has changed. This commit updates this
test to reflect the new position.

Additionally, a comment has been added to hopefully make failures in
this test easier to grok for people moving forward.
 2016-02-17 20:54:44 -06:00
justinta89
d16b520d79 Fixed lint error 2016-02-17 15:43:03 -07:00
Mike Place
74a8f008f5 Merge pull request #31143 from kraney/boto_apigateway 
Boto apigateway
 2016-02-17 15:17:16 -07:00
justinta89
b3c1fa8de2 Fixed lint errors 2016-02-17 15:01:59 -07:00
Joe Julian
783e9b2e13 Rework tests and fix reverse peering with gluster 3.7 
Reworked the test structure design for the gluster module and state so I
could create a test that mimiced the behavior difference between 3.7 and
prior versions when reverse probing by ip a server that already exists.

Added the additional data given by gluster 3.7 to the output of
glusterfs.list_peers to allow us to compare a requested peering against
a host's aliases.

Fixes #30932
 2016-02-17 13:10:07 -08:00
rallytime
023ad4635c Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/win_update.py
  - salt/states/win_update.py
 2016-02-17 09:33:08 -07:00
Justin Findlay
a119fa0e66 tests/unit/utils/url_test.py: remove env support 2016-02-16 20:33:23 -07:00
Justin Findlay
4e709ab2be tests/unit/pydsl_test.py: remove env support 2016-02-16 20:33:23 -07:00
Mike Place
52a3c9b0c9 Merge pull request #31130 from ticosax/saltnado_pass_get 
Saltnado: provide also get parameters to the context
 2016-02-16 10:18:52 -07:00
Nicolas Delaby
f0a6d2b814 Saltnado provide also get parameters to the context 2016-02-15 10:09:02 +01:00
Derek Schaller
8d7ab01c67 Fixing npm cache cleaned lint errors 2016-02-12 20:35:13 -08:00
Derek Schaller
6c88c43f28 Merging in cachedout's test fixes 2016-02-12 20:09:22 -08:00
Derek Schaller
4a133d5ddc cache_clean should return a mocked value 2016-02-12 19:51:22 -08:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
justinta89
d43d24ba6c Added more basic unit tests to unit.utils.network 2016-02-12 13:07:07 -07:00
Mike Place
498dec2e91 Fix tests 2016-02-12 10:56:01 -07:00
Tarjei Husøy
ceae2a16f8 Support match-sets in iptables module 
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
 2016-02-12 10:24:50 -07:00
Erik Johnson
23b6c08727 Lint fixes for merge-forward 2016-02-12 10:44:18 -06:00
Colton Myers
0a7b958ae3 Fix s3 test for new kms_keyid parameter/return 2016-02-12 09:21:49 -07:00