Commit Graph

3062 Commits

Author SHA1 Message Date
Robert Fach
71d3e34342 implemented&tested gem state sources_add, sources_remove, added test cases 2015-02-04 17:27:35 +00: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
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
Justin Findlay
eaa704cf47 change perms on some tests/ files 2015-01-17 19:32:43 -07:00
Erik Johnson
24752ffe93 Fix archive tests 2015-01-13 22:19:14 -06:00
Mike Place
c172470c30 Try giving some rest tornado requests a little more time 2015-01-13 14:17:55 -07: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
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
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
f31128bcc6 Merge pull request #19492 from basepi/shell01
Set python_shell=false
2015-01-08 11:45:29 -07:00
Colton Myers
522467f546 Fix gem failure 2015-01-08 10:42:55 -07:00
Thomas S Hatch
792b0ba9c6 added the shell call to too many tests 2015-01-08 10:13:50 -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
Thomas S Hatch
0e1683672f first round of pip test updates 2015-01-07 14:54:36 -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
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
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
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
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