valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,443 Commits 24 Branches 182 Tags 341 MiB
82cee58e72
Commit Graph

4975 Commits

Author SHA1 Message Date
Nicole Thomas
82cee58e72 Merge pull request #40194 from terminalmage/fix-docker-test-imports 
Change imports for dockerng tests
 2017-03-21 13:34:54 -06:00
Erik Johnson
6caedb0de8 Change imports for dockerng tests 
This should fix path issues in the test suite.
 2017-03-21 11:56:29 -05:00
Mike Place
d9cb222aa8 Merge pull request #40034 from sp1r/fix-pillar-scheduling 
Disallow modification of jobs from pillar with schedule execution module
 2017-03-21 10:36:33 -06:00
Mike Place
461e15f0f4 Merge pull request #40158 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-20 14:34:22 -06:00
rallytime
f32d8a8683 Don't try to run the dockerng unit tests if docker-py is missing 2017-03-20 13:34:15 -06:00
rallytime
f4d4768a6d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/utils/__init__.py
 2017-03-20 11:08:28 -06:00
Ivan Babrou
af1545deed
Use the first address if cannot connect to any 
This fixes #39995. The previous work happened in #39289.
 2017-03-18 21:09:16 -07:00
Vyacheslav Spiridonov
9d5db1910c fix initial data structure for schedule tests 2017-03-15 21:02:08 +03:00
Vyacheslav Spiridonov
d3a2489c9c schedule tests to ensure pillar jobs are not modified 2017-03-15 18:36:15 +03:00
Mike Place
899e037f0a Merge pull request #39932 from rallytime/cp-beacon-fixes 
Cherry-pick the beacon fixes made in #39930 to 2016.11
 2017-03-09 17:21:08 -07:00
Nicole Thomas
c2d4d17589 Merge pull request #39770 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-09 15:00:17 -07:00
rallytime
4a52cca926 Pylint fixes 2017-03-09 14:55:33 -07:00
Pedro Algarvio
be06df9b64 Remove *args, **kwargs. Not needed, not useful. 2017-03-09 13:11:07 -07:00
Pedro Algarvio
4a242829ee These tests aren't even using mock! 
Conflicts:
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-09 13:10:43 -07:00
Pedro Algarvio
6408b123e7 These tests are not destructive 
Conflicts:
  - tests/unit/beacons/inotify_beacon_test.py
 2017-03-09 13:09:32 -07:00
Nicole Thomas
8ecc719f90 Merge pull request #39852 from rallytime/bp-39651 
Back-port #39651 to 2016.11
 2017-03-06 14:18:33 -07:00
dharper
e2a232921d Checking instance exists in master._get_cached_minion_data when cache.fetch returns None 2017-03-06 09:09:03 -07:00
rallytime
776a9431b9 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-01 16:07:14 -07:00
Erik Johnson
3bb0ebd872 Update tests for PR 39727 
Also reduce the complexity of some of the mocking by adding the cachedir
to the global state.__opts__.
 2017-03-01 12:10:28 -06:00
rallytime
756f1de2d2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/states/file.py
 2017-02-27 13:13:46 -07:00
Erik Johnson
c7dfb494a6 Fix mocking for grains refresh 2017-02-25 21:04:48 -06:00
Erik Johnson
ca54541abe Add missing unit test for disable func 2017-02-24 01:12:42 -06:00
rallytime
7b9b3f700d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-22 16:27:08 -07:00
Mike Place
c10965833a Merge pull request #39289 from bobrik/autodetect-ipv6 
Autodetect IPv6 connectivity from minion to master
 2017-02-22 12:05:32 -07:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-21 13:59:14 -07:00
Mihai Dinca
9fedb84607 Always return oscap's stderr 2017-02-20 10:36:01 +01:00
Mihai Dinca
0ecde2cd02 Include oscap returncode in response 2017-02-20 10:36:01 +01:00
Mike Place
9c4292fb4e Merge pull request #39423 from dincamihai/openscap 
Openscap module
 2017-02-17 11:31:04 -07:00
Mihai Dinca
9d13422ac1 OpenSCAP module 2017-02-17 13:50:29 +01:00
Mike Place
e652a45592
Fix mocks in win_disim tests 2017-02-16 12:26:49 -07:00
Megan Wilhite
1acf00da3b add 2016.11.3 changelog to release notes (#39451) 2017-02-16 10:49:53 -07:00
rallytime
2acb188ac9 Change `path` value from a tuple to a list 
The type of the ``path`` value changed in #38188.

This updates the type in the unit test, as well as rearranges some
of the imports to be more standardized with ``ensure_in_syspath``.
 2017-02-15 15:39:53 -07:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -07:00
Ivan Babrou
e8a2cc0488
Do no try to connect to salt master in syndic config test 2017-02-14 11:16:32 -08:00
Mihai Dinca
91383c5a19 Add cp.push test 2017-02-14 17:16:28 +01:00
Mike Place
03ab8b1b5a Merge pull request #39303 from kstreee/fix-testcase-rm-batch-in-netapi 
Removes a redundant test case after removed 'batch' in 'netapi'.
 2017-02-13 12:55:46 -07:00
kstreee
51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. 2017-02-10 07:12:22 +00:00
rallytime
a9c2c106c1 Pylint fix 2017-02-09 08:50:56 -07:00
rallytime
f6aad99db2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/loader.py
  - salt/output/highstate.py
  - salt/runners/fileserver.py
 2017-02-08 16:57:54 -07:00
Erik Johnson
1b9217d636 Update jsonschema tests to reflect change in jsonschema 2.6.0 (#39260) 
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
 2017-02-08 16:51:56 -07:00
Nicole Thomas
84ff63875c [2016.11] Merge forward from 2016.3 to 2016.11 (#39234) 
* Fix for #38697

* Lint fixes

* Added missing source_hash_name argument in get_managed function
Additional fix to  #33187
Customer was still seeing errors, this should now work.
Tested with 2015.8.13 and 2016.11.2

* [2016.3] Pylint fix (#39202)

* Ignore empty dicts in highstate outputter

Closes #37174

* Sort the return list from the fileserver.envs runner

* Fix the win_ip_test failures (#39230)

The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 16:06:56 -07:00
Nicole Thomas
ef4e437bbc Fix the win_ip_test failures (#39230) 
The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 14:53:59 -07:00
Mike Place
30455079fe Merge pull request #39153 from nicholasmhughes/fix-selinux.mode-config-predictability 
Fix selinux.mode state config file handling
 2017-02-06 11:37:34 -07:00
Mike Place
b240468525 Merge pull request #39162 from meaksh/snapper-module-improvements 
Adding more function to Snapper module
 2017-02-06 11:33:52 -07:00
nicholasmhughes
8d8ba9c7d2 added the new getconfig function to the test 2017-02-06 09:55:09 -05:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
 2017-02-03 09:48:58 -07:00
Pablo Suárez Hernández
9d6a33f257 Adds 'snapper.create_config' unit tests 2017-02-03 15:41:58 +00:00
Pablo Suárez Hernández
d38ed505f8 Adds 'snapper.modify_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Pablo Suárez Hernández
d5496ccc99 Adds 'snapper.delete_snapshots' unit tests 2017-02-03 15:41:29 +00:00
Erik Johnson
646b9ea4e5 Don't abort pillar.get with merge=True if default is None (#39116) 
* Don't abort pillar.get with merge=True if default is None

This prevents a SaltInvocationError from being raised if the default is
loaded from a import_yaml jinja macro and the file being loaded is empty
(which is an entirely valid use case). In these cases, the loaded
default would be None, which we don't want to cause an exception.

* Add test case for issue 39062
 2017-02-01 15:07:31 -07:00