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
67,199 Commits 24 Branches 182 Tags 341 MiB
1fa7c021b3
Commit Graph

6791 Commits

Author SHA1 Message Date
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
Justin Anderson
65614b7f0f Updated salt.spec bash_completion 2016-04-07 09:16:47 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
 2016-04-05 15:09:27 -06:00
Erik Johnson
fbbf5935aa Add missing spm manpage and bash_completion file 
Also remove duplicate entries for master/minion conf templates
 2016-04-04 16:53:56 -05:00
Erik Johnson
80f7c31d53 buildpackage.py: add salt.bash to SOURCES 2016-04-04 16:53:56 -05:00
Erik Johnson
969519b37e Remove unnecessary cd command 2016-04-04 16:53:56 -05:00
Erik Johnson
ead5c3d6bc Fix missing endif 2016-04-04 15:25:46 -05:00
Mike Place
234a5c365c Merge pull request #32283 from jtand/user_preset_test_fix 
Changed /tmp/ to /home/ user.present test
 2016-04-04 12:02:08 -06:00
Mike Place
95bcdaa4bb Merge pull request #32287 from rallytime/reimplement-31172 
Reimplement #31172, which got removed in a merge-forward.
 2016-04-04 11:53:11 -06:00
Mike Place
edbab99164 Merge pull request #32295 from rallytime/test-cloud-deploy-dir 
Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
 2016-04-04 11:38:47 -06:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Justin Findlay
e7ee59fb6c modules.parallels: add unit tests 2016-04-02 16:42:00 -06:00
Erik Johnson
29723182f9 Update buildpackage spec 2016-04-01 17:57:42 -05:00
rallytime
4037476f40 Patch call to os.path.isdir so we know both search paths are in tuple 2016-04-01 15:13:57 -06:00
rallytime
e195376f61 Patch isdir call and test seach path tuple positions as well 2016-04-01 15:09:57 -06:00
rallytime
b86f6922c4 Print search_paths return for debugging 2016-04-01 13:52:43 -06:00
rallytime
bf48922e7d Add test for 'deploy_scripts_search_path' contents in salt.config.cloud_config 2016-04-01 09:43:30 -06:00
rallytime
49a4eec051 Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config 
Refs #32183
 2016-04-01 09:40:58 -06:00
Justin Anderson
c6a1d8b7ba Changed /tmp/ to /home/ user.present test 2016-03-31 15:13:58 -06:00
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest 
Ensure latest pkg.info_installed ensure latest
 2016-03-31 11:09:59 -05:00
Mike Place
8ca6bf2177 Merge pull request #32259 from jfindlay/tmpdir 
MacOS tmpdir
 2016-03-31 08:31:07 -06:00
Justin Findlay
8f558a5f41 tests...runtests_helpers: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:40 -06:00
Justin Findlay
0edd532add tests.integration: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:39 -06:00
Justin Findlay
c74c241831 tests.integration: use os.path.realpath 
This reverts bf894c37, 6b99798b, and 4028d80e.  `os.path.realpath`
behaves identically to `salt.utils.abs_readlink` on the doc tests in
that function.
 2016-03-30 21:09:39 -06:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
rallytime
ea3d21d126 Fix failing test 2016-03-30 16:53:42 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 13:38:38 -06:00
Mike Place
4a5d1b1dd3 Merge pull request #31768 from twangboy/mac_xattr_int 
Integration Tests for mac_xattr.py
 2016-03-30 13:03:25 -06:00
Mike Place
2816982178 Merge pull request #31959 from twangboy/mac_timezone_int 
Integration tests for mac_timezone.py
 2016-03-30 13:03:15 -06:00
Mike Place
50e34574d7 Merge pull request #31840 from twangboy/mac_shadow_int 
Integration tests for mac_shadow
 2016-03-30 13:02:44 -06:00
twangboy
dfe148934b Fix typo 2016-03-30 12:56:39 -06:00
twangboy
a45d2270df Remove test for _convert_to_datetime 2016-03-30 12:56:39 -06:00
twangboy
845809139c Add test for _convert_to_datetime 2016-03-30 12:56:39 -06:00
twangboy
3a6ad91509 Fix some pylint errors 2016-03-30 12:56:39 -06:00
twangboy
f1a5134b92 Total rewrite of mac_shadow.py 
Updated mac_shadow integration tests
 2016-03-30 12:56:39 -06:00
twangboy
c62920fb08 Add destructiveTest decorators 2016-03-30 12:56:39 -06:00
twangboy
9fe91a8fb5 Fix __random_string assignment 2016-03-30 12:56:39 -06:00
twangboy
1da27172b9 Add integration tests for mac_shadow 2016-03-30 12:56:39 -06:00
Mike Place
5d08db7c92 Merge pull request #32162 from terminalmage/issue31963 
Properly handle yum/zypper repositories in pkgrepo.managed
 2016-03-30 11:51:05 -06:00
Mike Place
231da529e0 Merge pull request #32224 from Ch3LL/add_grains_match_test 
Add grains match with wildcard tests
 2016-03-30 11:30:42 -06:00
Erik Johnson
5c1bdb812c Fix pkgrepo integration test 
Also re-enabled test on ubuntu 15.10.
 2016-03-30 11:34:55 -05:00
Ch3LL
665468b5e8 fix pylint 2016-03-30 10:28:48 -06:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Bo Maryniuk
afdf451d87 Remove tests from the zypper_test that belongs to rpm_test 2016-03-30 17:33:03 +02:00
twangboy
66afd4855c Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
93f252d868 Fix some pylint errors 2016-03-30 08:56:49 -06:00
twangboy
f5f7249c37 Fix unit tests 2016-03-30 08:56:49 -06:00