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
71,689 Commits 24 Branches 182 Tags 341 MiB
ae89b9063e
Commit Graph

7718 Commits

Author SHA1 Message Date
Seth House
ca61237de7 Ensure 'data' remains a dictionary if conf file is empty or missing 2016-07-26 12:41:42 -06:00
Nicole Thomas
73d3b77a2c Merge pull request #34960 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-26 12:32:41 -06:00
Mike Place
55bb3d09ab Merge pull request #34919 from tonybaloney/libcloud_dns_states 
Add a new state module for managing DNS records and zones through Libcloud
 2016-07-26 11:51:08 -06:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Anthony Shaw
6c08afd62b GCE Cloud tests (#34871) 
* add test module

* modify GCE tests to remove mocks

* use certifi, libcloud has also patched the SuSE/Mac cert issues

* skip cert checking

* validate the __virtual__ and import process

* fix munged merge

* fixed lint errors and failing test

* fix dimensiondata tests in the same way whilst I'm here
 2016-07-26 09:24:20 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
rallytime
8b295fe4ea Merge branch '2015.8' into '2016.3' 
Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py
 2016-07-25 14:13:44 -06:00
Anthony Shaw
8df4c35f5c
zone absent with tests 2016-07-24 19:48:11 +10:00
Anthony Shaw
3b5ddcb607
added zone_present state check 2016-07-24 19:45:06 +10:00
Anthony Shaw
4d7f3169f6
added zone_present state check 2016-07-24 19:43:06 +10:00
Anthony Shaw
fa04e2fcf5
use the correct dictionary structure for state changes 2016-07-24 19:30:32 +10:00
Anthony Shaw
fa5ac70183
add record absent logic and tests 2016-07-24 19:16:48 +10:00
Anthony Shaw
7f28b14958
fix tests 2016-07-24 19:06:34 +10:00
Anthony Shaw
51654e9b7a
add record name to mocks 2016-07-24 17:34:29 +10:00
Anthony Shaw
cb13bb6fba
add test with mocked execution module 2016-07-24 17:13:51 +10:00
Erik Johnson
92fffb06a7 Update unit test 
This unit test asserts based on the args with which a function was
called, and the args were changed which broke the test. This fixes the
test.
 2016-07-22 21:21:55 -05:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
Mike Place
1aee8b7dd4 Merge pull request #34906 from cachedout/set_run_salt_timeout 
Set timeout for run_salt in test suite
 2016-07-22 16:43:48 -06:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707 
Feature addition: preserve mode in file states
 2016-07-22 16:43:31 -06:00
Mike Place
38ac79d8bb Merge pull request #34829 from gtmanfred/py3 
[PY3] tests.unit.pillar
 2016-07-22 16:33:47 -06:00
Mike Place
5e0c63c0eb Merge pull request #34886 from eradman/cron 
Preserve trailing lines in crontab
 2016-07-22 16:25:23 -06:00
Mike Place
345e3e56b8 Merge pull request #34899 from rallytime/integration-cli-tests 
Fix integration/cli/*.py test failures when Running in Python 3
 2016-07-22 16:22:11 -06:00
Mike Place
cdfd0161fc Set timeout for run_salt in test suite 2016-07-22 16:14:25 -06:00
rallytime
56fb834718 Remove tests that don't test anything 2016-07-22 16:12:16 -06:00
Mike Place
ab84fd273e Merge pull request #34637 from cachedout/int_tests_interfaces 
Int tests interfaces
 2016-07-22 15:58:59 -06:00
rallytime
1031f19f3d Update batch integration tests to not be flaky in Python3 2016-07-22 14:19:15 -06:00
rallytime
109b368d19 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-22 10:32:59 -06:00
Eric Radman
b9be6521db Preserve trailing lines in crontab 
This allows cron.file to install a crontab file that contains trailing
newlines. Previously a change may have been detected on every run.
 2016-07-22 12:18:08 -04:00
Bo Maryniuk
87ffd6dc1e Regression fix: minion ID generator should use FQDN first, if available (#34876) 
* Regression fix: use FQDN first, if available

* Adjust the tests to the new behaviour (FQDN first)
 2016-07-22 09:21:42 -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
Anthony Shaw
7e5cf2676b
fix munged merge 2016-07-22 14:31:52 +10:00
Anthony Shaw
7f31ccbf1e Merge branch 'develop' of github.com:saltstack/salt into develop 2016-07-22 13:19:34 +10:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
Mike Place
d85aca1f7a Merge branch 'develop' into int_tests_interfaces 2016-07-21 12:26:21 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Erik Johnson
f9cd83e8bb Add integration test for mode=keep when source is a local path 2016-07-20 22:26:10 -05:00
Erik Johnson
1cd542edb8 Add integration test for mode=keep in file states 2016-07-20 22:08:16 -05:00
Daniel Wallace
d2341654ea [PY3] actually test with nodegroup_comp function 2016-07-20 17:06:35 -05:00
Daniel Wallace
1e3429a3a2 [PY3] skip mysql tests 
mysql-python is not compatible with python3 yet.
 2016-07-20 17:05:49 -05:00
twangboy
8f29723160 Fix duplicate import, circular reference 2016-07-20 14:34:58 -07:00
Erik Johnson
e9be937d8f Fix incorrectly-written test 
This was testing to confirm incorrect behavior. We should not be having
a leading zero when the setuid/setgid bit is set in the mode.
 2016-07-20 15:33:11 -05:00
rallytime
094731f4b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-20 12:32:08 -06:00
Mike Place
3342b0c664 Merge remote-tracking branch 'twangboy/int_tests_cachedout' into int_tests_interfaces 2016-07-20 10:25:42 -06:00
Mike Place
ec8a6ebab3 Correct config test errors 2016-07-20 10:00:31 -06:00
Mike Place
03039c13e2 Lint 2016-07-20 10:00:31 -06:00
Mike Place
5f5d7193b0 Add interface to all configs 
This got removed during the attempt to make the tests run on Windows.

I added them everywhere even though that's not strictly necessary.

Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
 2016-07-20 10:00:31 -06:00