valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,341 Commits 24 Branches 182 Tags 341 MiB
9202cbba78
Commit Graph

726 Commits

Author SHA1 Message Date
Justin Findlay
9202cbba78 fix dnsmasq unit tests 2015-01-17 15:44:45 -07:00
Rupesh Tare
e5bdbf592c Implemented unit test cases for dnsmasq module 2015-01-09 17:06:59 +05:30
Thomas S Hatch
4ff285a002 Merge pull request #19511 from gracinet/19329-pillar-introspection 
Provide modules.pillar.obfuscate and modules.pillar.ls
 2015-01-08 16:56:53 -07:00
Colton Myers
a60fa6b3d1 Merge branch '2015.2' into develop 2015-01-08 11:29:08 -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
Mike Place
bb0c32e44d Another missed quote 
Conflicts:
	tests/unit/modules/postgres_test.py
 2015-01-08 10:17:39 -07:00
Mike Place
68b6815883 Another missed quote 2015-01-08 10:16:02 -07:00
Georges Racinet
e94fe6de31 Mark function as private 
With the leading underscore, _obfuscate_inner should be excluded from the CLI
(and the related lint tests)
 2015-01-08 17:41:49 +01: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
Georges Racinet
eb70dcf67d Provide modules.pillar.obfuscate and modules.pillar.ls 
This fulfills #19329. As explained there, 'ls' is not that useful, but
still including it for completeness.
Also first attempt at writing a unit test within salt.
 2015-01-08 09:44:51 +01:00
Mike Place
96fdbc474a Fix postgres test 2015-01-07 22:38:51 -07:00
rallytime
8bf6edcf45 Merge branch '2015.2' into merge_forward_develop 2015-01-07 21:08:40 -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
rallytime
74a1861655 Merge branch '2015.2' into merge_forward_develop 2015-01-07 17:01:25 -07:00
Mike Place
3830162952 Some expressions are not so regular 2015-01-07 15:53:07 -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
Justin Findlay
d8785de0fd fix uwsgi test 2015-01-07 11:57:44 -07:00
Thomas S Hatch
c9b003ac66 Merge pull request #19445 from rupeshta/devmap_unit_tests 
Implemented unit test cases devmap module
 2015-01-07 10:21:12 -07:00
Thomas S Hatch
f5572a3308 Merge pull request #19443 from rupeshta/bridge_unit_tests 
Implemented unit test cases for bridge module
 2015-01-07 10:20:17 -07:00
Thomas S Hatch
48097d7fed Merge pull request #19442 from rupeshta/daemontools_unit_tests 
Implemented unit test cases for module daemontools
 2015-01-07 10:20:02 -07:00
Thomas S Hatch
3252ca95ce Merge pull request #19441 from rupeshta/composer_unit_tests 
Implemeted unit test cases for module composer
 2015-01-07 10:19:16 -07:00
Thomas S Hatch
58fd3cc575 Merge pull request #19377 from jayeshka/augeas_cfg_unit_test 
adding augeas_cfg unit test case
 2015-01-07 10:08:03 -07:00
Rupesh Tare
f231b5dd35 Implemented unit test cases devmap module 2015-01-07 18:49:12 +05:30
Rupesh Tare
94f6372678 Implemented unit test cases for bridge module 2015-01-07 18:07:36 +05:30
Rupesh Tare
a760eaea4a Implemented unit test cases for module daemontools 2015-01-07 17:56:06 +05:30
Rupesh Tare
24e1e40550 Implemeted unit test cases for module composer 2015-01-07 17:39:00 +05:30
Jayesh
2d3e40d69a added check for augeas python package 2015-01-07 14:19:35 +05:30
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
Mike Place
1700450dd8 Merge pull request #19432 from cachedout/fix_group_test 
Allow for variations in distros in group test
 2015-01-06 22:05:53 -07:00
Mike Place
309f91a979 Allow for variations in distros in group test 2015-01-06 22:04:19 -07:00
Mike Place
f06b5ae344 Merge pull request #19427 from cachedout/kmod_skip 
Skip kmod test if /etc/modules isn't present
 2015-01-06 20:37:39 -07:00
Mike Place
22ccbf0542 Skip kmod test if /etc/modules isn't present 2015-01-06 20:36:45 -07:00
rallytime
69d484d65d pylint fix 2015-01-07 00:57:50 +00:00
rallytime
f40affd5d9 Fix blockdev module unit tests 2015-01-06 23:00:12 +00:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
 2015-01-06 14:16:15 -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
Mike Place
170ce2a6f3 Merge pull request #19396 from cachedout/remove_unused_import_in_cp 
These were unused and causing weird recursion errors in unit tests
 2015-01-06 11:04:25 -07:00
Mike Place
c706ed279c These were unused and causing weird recursion errors in unit tests 2015-01-06 11:03:21 -07:00
Thomas S Hatch
b01ac59df6 fix bad lint error 2015-01-06 10:13:47 -07:00
Thomas S Hatch
ab0b432d94 Merge branch 'apache_unit_test' of https://github.com/jayeshka/salt into jayeshka-apache_unit_test 2015-01-06 10:11:50 -07:00
Jayesh
508ec1adea removed pylint error in augeas_cfg unit test case 2015-01-06 11:49:48 +05:30
Jayesh
2edf731c97 adding augeas_cfg unit test case 2015-01-06 11:19:36 +05:30
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