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
46,348 Commits 24 Branches 182 Tags 341 MiB
247d38d1da
Commit Graph

3683 Commits

Author SHA1 Message Date
Thomas Jackson
725708a04b Correct tag name in loader tests 2015-02-07 12:02:23 -08:00
Thomas Jackson
bb89068010 Add "disabled" support 
this allows you to "blacklist" modules.

Addition to #20274

Conflicts:
	salt/loader.py
 2015-02-07 12:02:03 -08:00
rallytime
15a140ece4 Moved tests/unit/loader.py to tests/integration/loader/loader.py 
These are integration tests and not unit tests, so they should be
in the proper directory.

Also, fixed up the python 3 incompatability pylint errors.
 2015-02-07 11:59:47 -08:00
Thomas Jackson
fb0d46f445 Pylint 2015-02-07 11:59:03 -08:00
Thomas Jackson
368e5a8e92 Add test for __func__alias__ 2015-02-07 11:59:03 -08:00
Thomas Jackson
9ee188dd90 More loader tests 
As well as an optimization on clear()
 2015-02-07 11:59:01 -08:00
Thomas Jackson
fe2d141081 Add loader tests 2015-02-07 11:59:00 -08:00
Thomas Jackson
726f8dc2ac Check that __context__ is always present, since it now is (properly) 2015-02-07 11:59:00 -08:00
Thomas Jackson
795fa12415 Remove test as well 
Conflicts:

	tests/unit/output/grains.py

Conflicts:
	tests/unit/output/grains.py
 2015-02-07 11:57:40 -08:00
Thomas Jackson
e1f8ea650f Remove grains outputter 
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working

Conflicts:

	salt/output/grains.py

Conflicts:
	salt/output/grains.py
 2015-02-07 11:57:14 -08:00
Thomas Jackson
02e219e452 Pack modules to runners 2015-02-07 11:54:39 -08:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
rallytime
db612d0b81 Clean up some pylint on 2015.2 
This way PRs against 2015.2 will be a little happier
 2015-02-06 07:58:26 -07:00
Justin Findlay
a44368001b fix pip venv regression, deprecate activate param 
Fixes #20191.  If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv.  Also
update associated unit test.
 2015-02-05 12:36:42 -07:00
Justin Findlay
7c943ec8a7 only add successfully generated ssh keys to config 2015-02-04 16:16:41 -07:00
Colton Myers
44bd4fb906 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/cli/__init__.py
 2015-02-03 13:26:11 -07:00
Justin Findlay
8eab04bd69 fix linux_sysctl_test failures caused by #20314 2015-02-03 11:30:27 -07:00
rallytime
759ce02829 Pylint fix for 2015.2 2015-02-03 10:02:05 -07:00
Mike Place
68418d79a7 Typo 2015-02-02 13:52:26 -07:00
Mike Place
5291cf7809 Better detection for minimum pyzmq version 2015-02-02 13:52:26 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Thomas Jackson
3d1ae49d09 Pass opts not an ImmutableDict of opts 2015-01-28 18:43:45 -08:00
Thomas Jackson
645027c0fe cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix" 
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.

apparently I picked up some other changes I didn't mean to

Conflicts:
	salt/utils/event.py
	tests/integration/utils/test_reactor.py
 2015-01-28 18:43:43 -08:00
Thomas Jackson
5bfef71240 Pylint fix 2015-01-28 18:43:43 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix 
Conflicts:

	salt/utils/event.py
 2015-01-28 18:43:40 -08:00
Thomas S Hatch
daba06fac2 Merge pull request #20162 from rallytime/bp-20062 
Backport #20062 to 2014.7
 2015-01-28 15:06:07 -07:00
Thomas S Hatch
0b47a56773 Merge pull request #20000 from terminalmage/fix-19552 
Better check for pillar for jinja templating
 2015-01-28 14:35:56 -07:00
Mike Place
7c066c38a0 Increae default runner timeout to 60s 2015-01-28 13:56:41 -07:00
Nicole Thomas
a717549c4e Merge pull request #20116 from rallytime/merge_forward_to_fifteen 
Merge 2014.7 into 2015.2
 2015-01-28 12:15:08 -07:00
Thomas S Hatch
19b7db40b8 Merge pull request #19914 from jfindlay/shell_false 
change python_shell default to False
 2015-01-28 10:41:16 -07:00
rallytime
592ff1c748 Add extension_modules to mocked __opts__ in test_sock_path_len 2015-01-28 09:20:26 -07:00
rallytime
03558dc013 Fix some of the mocking on cmdmod_test 
This could still use some more love, but it should help for now.
 2015-01-27 14:15:04 -07:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2' 
Conflicts:
	salt/modules/localemod.py
 2015-01-27 13:24:14 -07:00
Thomas S Hatch
d199edde20 Merge pull request #20076 from rallytime/fix_states_file_tests 
Add some mocked variables to fix the file_test failures
 2015-01-26 20:38:53 -07:00
Erik Johnson
59e7481e2b Fix TestSaltCacheLoader tests 
Similar fixes as made for TestGetTemplate
 2015-01-26 16:04:21 -06:00
rallytime
cdc8039b58 Add some mocked variables to fix the file_test failures 
Also do a little clean up of states/file.py and salt/state.py
 2015-01-26 14:11:56 -07:00
Erik Johnson
d34c0c7787 Fix jinja tests 
With recent edits to the jinja templating system, file_roots and
pillar_roots are referenced, so they need to be in the mocked opts dict.
 2015-01-26 13:10:05 -06:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Pedro Algarvio
20e67986b3 Fix calls using user instead of runas. Make use of user. 2015-01-24 03:16:52 +00:00
Pedro Algarvio
a6c3915049 Fix order for proper diff on failure 2015-01-24 03:16:51 +00:00
Pedro Algarvio
da7fefaea6 Fix mock calls 2015-01-24 03:16:51 +00:00
Pedro Algarvio
5d35f856ac We no longer warn. 2015-01-24 03:16:51 +00:00
Mike Place
09d3d62174 Loosen test constraint and update runas arg 2015-01-24 03:16:50 +00:00
Mike Place
d9c9eb1a6a Yet even more test fixing. *sigh* 2015-01-24 03:16:50 +00:00
Mike Place
e7d959b6a5 Even MORE test fixing 2015-01-24 03:16:50 +00:00
Mike Place
7222d741de Even more pip test fixing 2015-01-24 03:16:50 +00:00
Mike Place
f14eeaabc1 Fix more failing tests 2015-01-24 03:16:50 +00:00
Mike Place
a8e6bd24e9 Fix failing pip tests 2015-01-24 03:16:49 +00:00
Colton Myers
c331a3c5cc 644 permissions 2015-01-23 16:59:09 -07:00
rallytime
69d7a6ebd0 Pylint fixes for the 2015.2 branch 2015-01-23 10:57:18 -07:00
Thomas S Hatch
9cdbf2b2f7 Merge pull request #19972 from rallytime/bp-19746 
Backport #19746 to 2015.2
 2015-01-22 17:55:27 -07:00
Mathias Gug
4670988a68 Fix style. 2015-01-22 14:41:05 -07:00
Mathias Gug
3b285798e3 Fix style. 2015-01-22 14:40:58 -07:00
Mathias Gug
dd097b730d Fix style issues. 2015-01-22 14:40:49 -07:00
Mathias Gug
4542072c4e Add boto_sns module and state. 
Include integration tests.
 2015-01-22 14:40:32 -07:00
Mathias Gug
a454d71bd5 Fix coding style. 2015-01-22 14:24:30 -07:00
Mathias Gug
adf4c7a1af Skip boto_iam integration tests if boto is not available 
or properly configured.
 2015-01-22 14:24:30 -07:00
Mathias Gug
6a18c71f1d Add comment. 2015-01-22 14:24:29 -07:00
Mathias Gug
0d158cfa12 Add get_account_id function boto_iam 
so that we can retrieve the AWS account id associated with the
credentials used to connect to AWS.
 2015-01-22 14:24:29 -07:00
rallytime
670538c9cd But only fix it in the correct place... 2015-01-22 01:22:18 -07:00
rallytime
e4856b6fc7 Fix assertion string in failing linux_lvm unit test 2015-01-22 01:20:16 -07:00
Justin Findlay
eaa704cf47 change perms on some tests/ files 2015-01-17 19:32:43 -07:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2 
Conflicts:
	salt/modules/archive.py
 2015-01-14 14:26:22 -06:00
Thomas S Hatch
7d5d095bae Merge pull request #19719 from terminalmage/archive-fixes 
Fix archive.zip, archive.unzip
 2015-01-14 12:16:55 -07:00
Erik Johnson
24752ffe93 Fix archive tests 2015-01-13 22:19:14 -06:00
Erik Johnson
904f9b6c90 Fix archive tests 
This fixes references to the badly-named legacy zip and unzip functions,
as well as skipping the unrar test when neither unrar and rar are
installed.
 2015-01-13 21:07:23 -06:00
Mike Place
c172470c30 Try giving some rest tornado requests a little more time 2015-01-13 14:17:55 -07:00
Pedro Algarvio
0ceda58bd6 Fix mock call. 2015-01-12 16:51:02 +00:00
Pedro Algarvio
9e121e3317 Fix brew unit tests 2015-01-12 02:30:38 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2 
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
 2015-01-11 22:40:16 +00:00
Mike Place
1277b71e2d Typo 2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
rallytime
d6b3f69c19 Cleaner and actual fix for the failing weird pip test for CentOS 5 2015-01-09 13:10:09 -07:00
Nicole Thomas
e46ccc8210 Merge pull request #19579 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-09 12:51:48 -07:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
 2015-01-09 11:39:09 -07:00
Mike Place
2ee4bead9e Adjust for a possible subtle bug in zeromq 2015-01-09 11:10:02 -07:00
Thomas S Hatch
31f825d9f2 Merge pull request #19539 from terminalmage/fix-archive-tests 
Update archive tests to use python_shell=False
 2015-01-08 16:43:09 -07:00
rallytime
ea769829af Fix my pylint errors 2015-01-08 15:09:55 -07:00
Colton Myers
174290b7aa Add python_shell=False to all the linux_acl mocks 2015-01-08 14:29:41 -07:00
Colton Myers
4f851c99ab Fix gem tests 2015-01-08 14:26:04 -07:00
rallytime
41841701e7 Fix djangomod.py integration test failures 2015-01-08 12:57:11 -07:00
rallytime
2443d11282 Change file perms back to executable 2015-01-08 12:56:27 -07:00
rallytime
8eab15780e Change file perms on runtests.py 2015-01-08 12:56:17 -07:00
rallytime
a150447b15 pylint fix 2015-01-08 12:56:09 -07:00
rallytime
6f74048688 Fix blockdev module unit tests 2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332 Update archive tests to use python_shell=False 2015-01-08 13:51:47 -06:00
Thomas S Hatch
1e670f7b3e Merge pull request #19478 from thatch45/qp_shell 
shellisms for q and p modules
 2015-01-08 11:54:44 -07:00
Colton Myers
4760dc0fb0 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-08 11:45:43 -07:00
Colton Myers
f31128bcc6 Merge pull request #19492 from basepi/shell01 
Set python_shell=false
 2015-01-08 11:45:29 -07:00
Colton Myers
d516dc07a2 Merge pull request #19487 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-08 11:28:20 -07:00
Colton Myers
522467f546 Fix gem failure 2015-01-08 10:42:55 -07:00
Mike Place
bb0c32e44d Another missed quote 
Conflicts:
	tests/unit/modules/postgres_test.py
 2015-01-08 10:17:39 -07:00
Thomas S Hatch
792b0ba9c6 added the shell call to too many tests 2015-01-08 10:13:50 -07:00
Colton Myers
e7b79de8da Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/ebuild.py
 2015-01-08 09:28:12 -07:00
rallytime
4aa60ce51a Fix linux_acl tests 2015-01-07 20:55:19 -07:00
Erik Johnson
5edba8e55e Add back double-quote 
This is in the actual dig output, I shouldn't have removed it.
 2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338 Fix dig tests 
This fixes the dig tests after dig.py was modified to use
python_shell=False.
 2015-01-07 19:59:16 -06:00
Mike Place
6dcd749b2b Merge pull request #19494 from cachedout/fix_failing_postgres 
Some expressions are not so regular
 2015-01-07 16:11:27 -07:00
Mike Place
3830162952 Some expressions are not so regular 2015-01-07 15:53:07 -07:00
Thomas S Hatch
0e1683672f first round of pip test updates 2015-01-07 14:54:36 -07:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
 2015-01-07 14:49:58 -07:00
Thomas S Hatch
a60ce30962 Merge pull request #19455 from jfindlay/split_uwsgi 
split uwsgi command
 2015-01-07 13:51:45 -07:00
Justin Findlay
d8785de0fd fix uwsgi test 2015-01-07 11:57:44 -07:00
rallytime
4e87557748 --local is not available in older versions of git 
Also adjust the tests:
    subprocess.check_output is only available in python 2.7
 2015-01-07 11:56:43 -07:00
rallytime
fe4fd7a5a3 Use skip_if_binaries_missing decorator 2015-01-07 10:11:26 -07:00
Thomas S Hatch
a0225079a5 Merge pull request #19324 from whiteinge/git_pillar-branch-env-mapping 
Added git_pillar branch to environment mapping
 2015-01-07 10:06:30 -07:00
Pedro Algarvio
06fdee00c8 Merge pull request #19426 from rallytime/merge_forward_fifteen 
Merge forward 2014.7 into 2015.2
 2015-01-07 09:27:40 +00:00
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
rallytime
80b07f3578 Merge branch '2014.7' into '2015.2' 
Conflicts:
	tests/buildpackage.py
 2015-01-06 20:32:36 -07:00
Nicole Thomas
dbbab28cdc Merge pull request #19425 from s0undt3ch/2014.7 
Ignore the file perms lint check
 2015-01-06 18:22:01 -07:00
Pedro Algarvio
a9eaf187e1 Ignore the file perms lint check 2015-01-07 01:15:56 +00:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
Mike Place
75c067432f Add debugging to jenkins script 2015-01-06 15:29:21 -07:00
Colton Myers
56eae4783a Merge branch '2014.7' into merge-forward-2015.2 2015-01-06 13:33:18 -07:00
Nicole Thomas
83e451d392 Merge pull request #19401 from rallytime/test_fixes 
Pylint and psutil unit test fixes for 2014.7 branch
 2015-01-06 13:24:15 -07:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -07:00
Mike Place
88f3477772 These were unused and causing weird recursion errors in unit tests 2015-01-06 11:22:32 -07:00
rallytime
73ef44dd9f Pylint fix for 2014.7 branch 2015-01-06 11:14:06 -07:00
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00:00
Thomas S Hatch
41bef7771e Merge pull request #19356 from rallytime/bp-19340 
Backport #19340 to 2014.7
 2015-01-06 10:17:49 -07:00
Thomas S Hatch
e31cd4208a Merge pull request #19352 from rallytime/bp-19280 
Backport #19280 to 2014.7
 2015-01-06 10:16:25 -07:00
rallytime
f6243f0b80 Fix the test in the correct place... 2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860 Fix pip state test failure 2015-01-05 15:20:18 -07:00
Nitin Madhok
f20f899b34 Changing return to match zpool list instead of zfs list 2015-01-05 14:05:55 -07:00
nmadhok
44454a3687 Replacing zfs with zpool 2015-01-05 14:05:55 -07:00
nmadhok
8670e399ce Adding unit tests for salt.modules.zpool 2015-01-05 14:05:55 -07:00
Mike Place
0194fbe77c Attempt to fix inconsintent VT test by preventing a spin 2015-01-05 13:35:02 -07:00
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07:00
Thomas S Hatch
cd1239a2d7 Merge pull request #19238 from jfindlay/ensure_cmd 
update cmd state and module integration tests
 2014-12-28 13:28:17 -07:00
Justin Findlay
4748156ed9 update cmdmod integration tests 2014-12-23 13:59:25 -07:00
Nitin Madhok
9f601484bf Fixing unit tests for mdadm 2014-12-23 11:31:58 -07:00
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
 2014-12-22 13:33:53 -07:00
Thomas S Hatch
6579d447ae Merge pull request #19175 from rupeshta/pw_group_unit_tests 
added unit test cases for pw_group module
 2014-12-22 09:37:32 -07:00
Thomas S Hatch
b8b8eb437f Merge pull request #19129 from nmadhok/unit-tests 
Adding unit tests for zfs.exists and zfs.create [WIP]
 2014-12-22 09:17:35 -07:00
Rupesh Tare
14e5ffe078 added unit test cases for pw_group module 2014-12-22 18:22:04 +05:30
Nitin Madhok
d4de045ede Salt modules must be imported after the ensure in syspath call 2014-12-21 11:44:57 -05:00
Nitin Madhok
2ef5edbbca Moving create success together 2014-12-20 13:04:53 -05:00
Nitin Madhok
4a3ba21201 Indentation 2014-12-20 13:02:21 -05:00
Nitin Madhok
21174f9b48 Adding another unit test to check for zfs.create success when properties are specified 2014-12-20 12:51:19 -05:00
Thomas S Hatch
fc3d15dd6a Merge pull request #19121 from nmadhok/fix-mdadm-create-module 
Fixing salt.modules.mdadm.create broken functionality
 2014-12-19 14:05:11 -07:00
Thomas S Hatch
296d711a5a Merge pull request #19120 from jayeshka/groupadd_unit_tests 
unit test case for groupadd
 2014-12-19 14:04:10 -07:00
Mike Place
a931dd63fe Increasing sleep to see if it fixes vt test 2014-12-19 14:01:20 -07:00
Nitin Madhok
16692ad446 Refactor mdadm tests 2014-12-19 13:55:07 -07:00
Nitin Madhok
f1d573c9d8 Forgot to end with quotes 2014-12-19 13:55:06 -07:00
Nitin Madhok
210d1d221f Fixing unit tests for mdadm 2014-12-19 13:55:06 -07:00
Nitin Madhok
95e16247b8 Adding another unit test to check for zfs.create success if create_parent=True 2014-12-19 14:16:19 -05:00
Nitin Madhok
e492962996 Adding another unit test to check for zfs.create failure if the parent datasets do not exist 2014-12-19 14:12:12 -05:00
Nitin Madhok
e46f3f71ed Adding another unit test to check for zfs.create failure if the pool doesnt exist 2014-12-19 14:07:40 -05:00
Nitin Madhok
78ade421aa Adding another unit test to check for zfs.create failure if trailing slash in name is present 2014-12-19 13:58:53 -05:00