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
45,153 Commits 24 Branches 182 Tags 341 MiB
d7a0405a56
Commit Graph

3721 Commits

Author SHA1 Message Date
rallytime
194c0696aa Fix my pylint errors 2015-01-06 17:27:38 -07:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
rallytime
f40affd5d9 Fix blockdev module unit tests 2015-01-06 23:00:12 +00:00
Mike Place
75c067432f Add debugging to jenkins script 2015-01-06 15:29:21 -07:00
rallytime
ed3a34624c Fix djangomod.py integration test failures 2015-01-06 22:26:46 +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
rallytime
73ef44dd9f Pylint fix for 2014.7 branch 2015-01-06 11:14:06 -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
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00:00
Thomas S Hatch
00e9686488 Merge pull request #19303 from cachedout/batch_ckminions 
Batch ckminions
 2015-01-06 10:37:42 -07:00
Thomas S Hatch
a7a5362798 Merge pull request #19370 from Seveland12/develop 
fixed typo in tests/consist.py
 2015-01-06 10:22:55 -07: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
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
Rupesh Tare
8c5148af42 writing unit test cases for cassandra module 2015-01-06 19:40:30 +05:30
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
sjwehry
8eb6de4e09 fixed typo in tests/consist.py 
fixed typo in tests/consist.py
 2015-01-05 20:01:16 -05: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
Nicole Thomas
f01ce36e89 Merge pull request #19340 from nmadhok/zpool-unit-test 
Adding unit tests for salt.modules.zpool
 2015-01-05 10:11:46 -07:00
Mike Place
f44e46d080 Adjust batch test 2015-01-05 10:04:15 -07:00
Jayesh
e20076691b adding apache unit test case 2015-01-05 15:06:14 +05:30
Nitin Madhok
c21c7c96c5 Changing return to match zpool list instead of zfs list 2015-01-04 23:48:30 -05:00
nmadhok
2c53cbec1d Replacing zfs with zpool 2015-01-05 10:04:38 +05:30
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07:00
Nicole Thomas
621bcee92d Merge pull request #19273 from jayeshka/extfs_unit_tests 
adding extfs unit test
 2015-01-03 20:20:09 -07:00
Thomas S Hatch
0e9c7ecf28 Merge pull request #19274 from rupeshta/drac_unit_tests 
implimented code for drac module
 2014-12-30 12:10:51 -07:00
Thomas S Hatch
7d3a37d82c Merge pull request #19246 from cachedout/more_cleanup 
More cleanup
 2014-12-30 11:50:12 -07:00
Jayesh
f14cfa9235 adding useradd unit test case. 2014-12-30 12:18:25 +05:30
Jayesh
2928d87cef resolved lint errors in extfs unit test 2014-12-30 11:48:43 +05:30
Mike Place
d9ad877d82 Merge pull request #19286 from cachedout/change_test_enc 
There is no support for ECDSA on OpenSSH < 5.7.
 2014-12-29 19:10:24 -07:00
Mike Place
0f6e94ab6d There is no support for ECDSA on OpenSSH < 5.7. 
This breaks tests on several platforms.
 2014-12-29 17:53:46 -07:00
Thomas S Hatch
4274a338e5 Merge pull request #19265 from jfindlay/log_color 
add color option to console logger
 2014-12-29 15:43:35 -07:00
Mike Place
e4d96cdd37 Merge pull request #19283 from cachedout/check_kmod_ioerror 
Check kmod ioerror
 2014-12-29 12:42:53 -07:00
Mike Place
5b02fd1cc1 Don't patch path existence 2014-12-29 12:41:58 -07:00
Mike Place
845546c009 Holiday lint 2014-12-29 11:27:05 -07:00
Mike Place
e5fb81970d Attempt to fix inconsintent VT test by preventing a spin 2014-12-29 10:26:48 -07:00
Rupesh Tare
722b43116e implimented code for drac module 2014-12-29 19:54:00 +05:30
Jayesh
b71372d4f1 adding extfs unit test 2014-12-29 19:29:41 +05:30
nmadhok
6d8aa5f00e Adding unit tests for salt.modules.zpool 2014-12-28 22:25:03 -05: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
Thomas S Hatch
763c0f600a Merge pull request #19217 from jayeshka/hosts_unit_tests 
Hosts unit tests
 2014-12-28 13:06:47 -07:00
Thomas S Hatch
845e123c95 Merge pull request #19174 from jayeshka/kmod_unit_tests 
adding kmod module unit tests
 2014-12-28 13:00:18 -07:00
Justin Findlay
13dca4548b fix utils unit test 2014-12-27 18:22:11 -07:00
Justin Findlay
feb3049aa8 pylint again (why was this not caught the first time?) 2014-12-27 14:23:25 -07:00
Justin Findlay
415f0785db pylint fixes 2014-12-27 14:11:01 -07:00
Justin Findlay
751e0c7f43 update color name consistency 2014-12-27 12:20:08 -07:00
Justin Findlay
32f5f245ca finally remove global, unused color declarations 2014-12-27 12:20:08 -07:00
Mike Place
9303e48f4b Change mysql pillar test to use updated class name 2014-12-24 11:19:22 -07:00
Rupesh Tare
42d6a26121 implimented unit test cases for mount module 2014-12-24 19:42:00 +05:30
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
Jayesh
92f36aa396 adding hosts unit test 2014-12-23 15:43:17 +05:30
Jayesh
f53666d15a error resolved in kmod unit test case 2014-12-23 14:48:13 +05:30
Jayesh
050e454167 adding hosts unit test case 2014-12-23 11:53:19 +05:30
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
Jayesh
4b7faa44ad adding kmod module unit tests 2014-12-22 17:32:24 +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
Nitin Madhok
d90a4ecf7f Adding another unit test to check for zfs.create failure if dataset name is missing 2014-12-19 13:46:33 -05:00
Mike Place
28252ba0b8 Merge pull request #19131 from cachedout/fix_pip_tests 
Fix failing tests in develop
 2014-12-19 11:46:14 -07:00
Nitin Madhok
fa5834b564 Change patches to all test functions 2014-12-19 13:38:42 -05:00
Mike Place
7ff6c22b9b Remove deprecated tests 2014-12-19 11:37:56 -07:00
Mike Place
05fed01430 Fix failing tests in develop 2014-12-19 11:05:47 -07:00
David Cournapeau
509bc7f4ae STY: add encoding in test module as well. 2014-12-19 09:53:34 -08:00
Mike Place
516c3ec9bc Merge pull request #19096 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-19 10:29:50 -07:00
Thomas S Hatch
9fea50e954 Merge pull request #19094 from thatch45/jayeshka-disk_unit_tests 
Merge #18953 with lint fixes
 2014-12-19 10:15:03 -07:00
Nitin Madhok
aa570e3ceb Changing AssertEquals to AssertTrue and AssertFalse 2014-12-19 11:45:16 -05:00
Mike Place
f407e69943 Merge pull request #19123 from rupeshta/pw_user_unit_tests 
added test cases for pw_user module
 2014-12-19 09:35:25 -07:00
Nitin Madhok
0b8bed6d94 Adding another unit test to check for zfs.create success 2014-12-19 11:04:19 -05:00
Nitin Madhok
2ed539ea61 Adding another unit test to check for zfs.exists failure 2014-12-19 10:36:28 -05:00
Nitin Madhok
5c8a81a166 Adding unit tests for zfs.exists 2014-12-19 10:29:33 -05:00
Nitin Madhok
9027d1fc2f Fixing unit tests for mdadm 2014-12-19 08:55:07 -05:00
Rupesh Tare
255d107d36 added test cases for pw_user module 2014-12-19 18:51:13 +05:30
Nitin Madhok
c992f04f32 Changing permissions of test files and fixing lint violations 2014-12-19 05:50:18 -05:00
Jayesh
0b1ea591ed unit test case for groupadd 2014-12-19 12:03:45 +05:30
Mike Place
3493cfae7e Replaced by pylint check. 2014-12-18 13:01:51 -07:00
Thomas S Hatch
2546c489f8 try out pylint disable for perms 2014-12-18 10:43:41 -07:00
Thomas S Hatch
6a9195e190 fix bad file perms 2014-12-18 10:42:25 -07:00
Thomas S Hatch
b8f4cc7021 more lint 2014-12-18 10:33:31 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
 2014-12-18 10:32:19 -07:00
Thomas S Hatch
cc8705bcba lint 2014-12-18 10:15:58 -07:00
Thomas S Hatch
6afb8b64d6 Merge branch 'disk_unit_tests' of https://github.com/jayeshka/salt into jayeshka-disk_unit_tests 2014-12-18 10:11:01 -07:00
Rupesh Tare
a851d449f5 class name changed 2014-12-18 11:53:10 +05:30
Rupesh Tare
97b53fbcec Merge branch 'develop' into linux_lvm_unit_tests 2014-12-18 11:00:03 +05:30
Rupesh Tare
01ba8b6b46 pylint bug fixing 2014-12-18 10:59:01 +05:30
Elias Probst
5a6811759f Fix tests for #18841. 2014-12-18 01:51:26 +01:00
Elias Probst
a2e52dd5fc Fix tests for #18841. 2014-12-18 01:51:08 +01:00
Elias Probst
e82c6ba7c0 Add missing line. 2014-12-18 01:50:39 +01:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Thomas S Hatch
efb087df09 Merge pull request #19051 from nmadhok/fix-module-mdadm-create 
Fixing salt.modules.mdadm.create and correcting incorrect code.
 2014-12-17 14:56:18 -07:00
Thomas S Hatch
45365c095e Merge pull request #19029 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-17 14:48:01 -07:00
Thomas S Hatch
d13d8b37b1 Merge pull request #19017 from rupeshta/at_unit_tests 
At unit tests
 2014-12-17 14:44:04 -07:00
Thomas S Hatch
c2c9e56b82 Merge pull request #18931 from cachedout/cli_refactor 
Refactor the entire CLI out of __init__
 2014-12-17 14:37:13 -07:00
Thomas S Hatch
6263382858 Merge pull request #18918 from cachedout/salt_cli_retcode 
Make salt cli return a non-zero error code if an error occurred
 2014-12-17 14:36:51 -07:00
Nitin Madhok
4cb2fd604c Refactor mdadm tests 2014-12-17 14:27:51 -05:00
Nitin Madhok
c7eee6385b Forgot to end with quotes 2014-12-17 13:48:57 -05:00
Nitin Madhok
502b340553 Fixing unit tests for mdadm 2014-12-17 13:46:34 -05:00
David Cournapeau
236ec08250 FEAT: first short at installing .pkg/.mpkg on OS X. 2014-12-17 09:58:35 -08:00
Rupesh Tare
c28620b805 created unit test cases for linux_lvm module 2014-12-17 19:54:11 +05:30
Elias Probst
6363aa22ac Add integration tests for 'modules.file.replace()'. 2014-12-17 12:06:58 +01:00
rallytime
b76f49b9d0 Pylint fix and skip all of the classes 2014-12-16 16:21:27 -07:00
rallytime
7f258bf729 Disable zcbuildout tests as they are not running reliably. 
These tests are not running reliably, aren't quite testing the functionalty
the way they should, and take too long to run as unit tests. When these get
reinstated, they should be implemented as integration tests instead of unit
tests.
 2014-12-16 16:00:51 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Rupesh Tare
64517b5449 Merge branch 'develop' into at_unit_tests 2014-12-16 19:50:03 +05:30
Rupesh Tare
8d271b173d added test cases for at and atc function from at module 2014-12-16 19:48:30 +05:30
Mike Place
67150306b6 Fix version test 2014-12-15 13:13:42 -07:00
Pedro Algarvio
a6b5011cb7 Typo 2014-12-15 19:28:26 +00:00
Mike Place
302d5cab39 Fix failing test 2014-12-15 12:04:35 -07:00
Mike Place
a8ab27df4c Make tests run 2014-12-15 11:36:19 -07:00
Thomas S Hatch
403f1404e4 Merge pull request #18956 from thatch45/merge_forward_8798 
Merge forward 2014.7
 2014-12-15 10:38:36 -07:00
Thomas S Hatch
75cc71b051 Merge pull request #18762 from jacksontj/2014.7 
Move reactor master-clients to threads
 2014-12-15 09:43:17 -07:00
Rupesh Tare
54bb776f9e Merge branch 'develop' into at_unit_tests 2014-12-15 17:29:54 +05:30
Rupesh Tare
fbafd6fb51 added unit test case for atrm & jobcheck functions from at module 2014-12-15 17:28:58 +05:30
Pedro Algarvio
71df7ac58a Skip tests which require the SSHD server running in case it's not 2014-12-13 00:11:41 +00:00
Thomas Jackson
545400e006 Pylint cleanup 2014-12-12 09:42:41 -08:00
Thomas S Hatch
bdc907dab6 Merge branch '2014.7' into merge_forward_8798 
Conflicts:
	salt/cli/__init__.py
	salt/cloud/clouds/ec2.py
	salt/scripts.py
	salt/utils/__init__.py
	salt/utils/saltminionservice.py
 2014-12-12 09:49:34 -07:00
Thomas Jackson
0e6195f778 Add some tests for ThreadPool 2014-12-12 08:16:18 -08:00
Thomas Jackson
77a7d9ab13 backport tests for process manager 2014-12-12 08:04:02 -08:00
Rupesh Tare
c86bdb6c16 created unit test case for function atq from module at 2014-12-12 19:23:22 +05:30
Jayesh
b69d81ee69 Added test case 2014-12-12 17:20:31 +05:30
Thomas S Hatch
b848e7ebe8 Merge pull request #18938 from cachedout/jid_util 
Refactor jid utils out of utils/__init__
 2014-12-11 17:27:00 -07:00
Thomas S Hatch
8e281dedcc lint fix 2014-12-11 16:58:10 -07:00
Mike Place
454da2545f Fix failing tests 2014-12-11 16:23:04 -07:00
Daniel Hobley
694adda563 Fixed unit tests for archive module 2014-12-11 22:46:36 +01:00
C. R. Oldham
28075d3c5e Merge pull request #18894 from cro/fbsd_sockstat 
Add support for sockstat on FreeBSD as an alternative to lsof
 2014-12-11 10:17:31 -07:00
Erik Johnson
c1fd180c45 Fix jinja tests 
These tests were using the now-outdated method of looking in the
file_roots for cached templates in masterless mode.
 2014-12-10 18:41:32 -06:00
C. R. Oldham
8e691d7f32 Fix lint 2014-12-10 16:43:42 -07:00
C. R. Oldham
dfdbdb0a26 Add support for sockstat on FreeBSD as an alternative to lsof 2014-12-10 15:52:02 -07:00
Elias Probst
2fe5e0309c Typo (assertInSalStatetWarning → assertInSaltStateWarning). 2014-12-10 21:04:11 +01:00
Mike Place
b811f633af Fix one more failing test 2014-12-10 09:33:54 -07:00
Mike Place
5d15fb1f1b Fix failing tests 2014-12-10 08:42:08 -07:00
Thomas S Hatch
bcb529f809 Merge pull request #18823 from scalp42/typos 
Correct some typos
 2014-12-09 14:43:15 -07:00
Thomas S Hatch
274aca9b5b Merge pull request #18844 from rallytime/fix_parted_tests 
Patch unittests when calling _validate_device
 2014-12-09 11:46:58 -07:00
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
 2014-12-09 10:59:18 -07:00
rallytime
8211dc2f00 Patch unittests when calling _validate_device 2014-12-09 10:48:02 -07:00
rallytime
db9ae406c3 Fix mocked calls in unit/modules/archive_test.py 
This is due to the changes in #18621
 2014-12-09 08:36:30 -07:00
Justin Findlay
b7467f5f45 update venv unit tests accordingly 2014-12-08 23:28:28 -07:00
Anthony Scalisi
55d1da42d3 fix typo in spec 2014-12-08 14:34:02 -08:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
Pedro Algarvio
e4f39ed32f Fix variable ref 2014-12-08 18:07:04 +00:00
Pedro Algarvio
9bf2f77b2e Make coverage reports optional 2014-12-08 17:32:28 +00:00
Thomas S Hatch
59f16926e9 Revert "Channel/Sreq cleanup" 2014-12-04 13:26:04 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Thomas S Hatch
f17b456e7d Merge pull request #18663 from terminalmage/buildpackage-jenkins-adjustment 
Always run download_packages() after executing buildpackage SLS
 2014-12-03 21:06:54 -07:00
Thomas S Hatch
b1b770014b Merge pull request #18592 from nazgul5/utils.network 
salt.utils.network._interfaces_ifconfig: SunOS fix
 2014-12-03 10:02:15 -07:00
Thomas Jackson
59b177097b Remove tests for old interface 2014-12-02 22:51:47 -08:00
Pedro Algarvio
60b9d47be5 Merge pull request #18638 from s0undt3ch/2014.7 
Some 2014.7 test fixes
 2014-12-03 00:54:43 +00:00
Erik Johnson
5c864fa003 Always run download_packages() after executing buildpackage SLS 
By restricting this function call to when the script is successful, we
end up losing the log file from buildpackage.py when it fails, making it next to
impossible to troubleshoot. This commit makes jenkins retrieve at least
the log file, no matter what happens.
 2014-12-02 17:49:50 -06:00
Pedro Algarvio
a964a2161e Switch imports and revert the assert to what it was. 2014-12-02 23:18:54 +00:00
Pedro Algarvio
04fe9382aa Merge pull request #18585 from rallytime/cmd_unittests 
Added some more cmdmod unittests
 2014-12-02 15:54:57 +00:00
Pedro Algarvio
6a259dc229 Proper minion config initialization. Fix test. 2014-12-02 07:55:52 +00:00
Pedro Algarvio
c6eab06e70 Add required imports 2014-12-02 07:44:16 +00:00
Pedro Algarvio
f720fc1f78 Proper minion config initialization 2014-12-02 07:43:18 +00:00
Pedro Algarvio
0dd818053e Proper minion config setup 2014-12-02 07:34:45 +00:00
Pedro Algarvio
55b68c389d Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:40:47 +00:00
Pedro Algarvio
83153354c4 Remove PyLint disable rule in 2014.7 
Since it's unlikely we upgrade PyLint in this branch
 2014-12-02 01:37:42 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
b37c76a800 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:09:15 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Pedro Algarvio
4372415db8 Merge branch 'merge-forward' of https://github.com/basepi/salt into develop 
Conflicts:
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 00:30:31 +00:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
Colton Myers
fcc2196a5f Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-12-01 15:04:03 -07:00
rallytime
3760915099 Skip test_max_open_files test until we can find the real problem 2014-12-01 13:43:57 -07:00
Vitalii Nazg
8f9af6802b Lint fixes: unused import, tabs 2014-12-01 22:08:23 +02:00
rallytime
a26cd377ff More cmdmod unittests 2014-12-01 08:57:11 -07:00
rallytime
c3d90c9f4f If umask=0 is provided, enter the umask if statement 
Previously the 'Zero umask is not allowed' statement was not getting hit
Also updated the appropriate umask tests
 2014-12-01 08:57:10 -07:00
rallytime
98b06be08a Added some more cmdmod unittests 2014-12-01 08:57:10 -07:00
rallytime
e7cdd75090 Add another cmdmod.py unittest 2014-12-01 08:57:10 -07:00
Pedro Algarvio
be18e8b244 Disable some Pylint errors 2014-12-01 03:24:41 +00:00
Pedro Algarvio
bdf3a3e91c Disable some Pylint errors 2014-12-01 03:24:37 +00:00
Pedro Algarvio
fd9377fefe Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Pedro Algarvio
a985f0ac4e Disable some Pylint errors 2014-12-01 03:23:52 +00:00
Vitalii Nazg
8ff9e7f7e9 salt.utils.network._interfaces_ifconfig: SunOS fix 
In SunOS 11.1 with IPv6 enabled interfaces occur twice in 'ifconfig -a'
output with the same name: for ipv4 and then for ipv6 addr family. Thus,
ipv6 data overwrites data collected from ipv4 interfaces.

Every instance has it's own 'UP' status and we assume that ipv4
status determines global interface status.

Thus commit tries to merge data from conflicting instances.

Also, regexp was tuned for SunOS's ifconfig.
 2014-11-28 19:02:45 +02:00
Pedro Algarvio
9d6c855e1a Disable some Pylint errors 2014-11-28 15:33:45 +00:00
Pedro Algarvio
b07707ff96 Disable some Pylint errors 2014-11-28 15:31:55 +00:00
Pedro Algarvio
8a1cc589a1 Disable some Pylint errors 2014-11-28 15:31:01 +00:00
Pedro Algarvio
14cc8931ed Disable some Pylint errors 2014-11-28 15:30:05 +00:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
Pedro Algarvio
78bc5107ee Switch open() for salt.utils.fopen() 2014-11-26 23:38:34 +00:00
Pedro Algarvio
62ec46d6dd Switch open() for salt.utils.fopen() 2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911 Switch open() for salt.utils.fopen() 2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720 Switch open() for salt.utils.fopen() 2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f Switch open() for salt.utils.fopen() 2014-11-26 23:30:18 +00:00
Pedro Algarvio
8735242906 We need to call read()! 2014-11-26 23:13:19 +00:00
Pedro Algarvio
b8b4158377 Remove unused import 2014-11-26 21:52:30 +00:00
Pedro Algarvio
aaf0f4aba0 Fix imports 2014-11-26 21:08:13 +00:00
Pedro Algarvio
1eeb02d93f Add a missed with 2014-11-26 21:07:39 +00:00
Pedro Algarvio
47edf6fc89 Fix the with context 2014-11-26 20:49:04 +00:00
Pedro Algarvio
bd7f23ac6f Switch open() for salt.utils.fopen() 2014-11-26 20:30:13 +00:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
 2014-11-26 20:14:56 +00:00
Pedro Algarvio
2d210b9055 Switch open() for salt.utils.fopen() 2014-11-26 18:33:22 +00:00
Pedro Algarvio
9f60901597 Switch open() for salt.utils.fopen() 2014-11-26 18:29:21 +00:00
Pedro Algarvio
737bd84402 Switch open() for salt.utils.fopen() 2014-11-26 18:28:56 +00:00
Pedro Algarvio
53f554468d Switch open() for salt.utils.fopen() 2014-11-26 18:28:15 +00:00
Pedro Algarvio
91af550062 Switch open() for salt.utils.fopen() 2014-11-26 18:25:20 +00:00
Pedro Algarvio
c4d0686024 Switch open() for salt.utils.fopen() 2014-11-26 18:24:08 +00:00
Pedro Algarvio
89befb8827 Switch open() for salt.utils.fopen() 2014-11-26 18:02:24 +00:00
Pedro Algarvio
b5cda75a8c Switch open() for salt.utils.fopen() 2014-11-26 18:01:35 +00:00
Pedro Algarvio
ea717d2422 Switch open() for salt.utils.fopen() 2014-11-26 17:59:52 +00:00
Pedro Algarvio
d27c38d28f Switch open() for salt.utils.fopen() 2014-11-26 17:57:57 +00:00
Pedro Algarvio
70b657af20 Switch open() for salt.utils.fopen() 2014-11-26 17:56:43 +00:00
Pedro Algarvio
46ea34b4f5 Switch open() for salt.utils.fopen() 2014-11-26 17:55:30 +00:00
Pedro Algarvio
32b2f2e05f Switch open() for salt.utils.fopen() 2014-11-26 17:54:29 +00:00
Pedro Algarvio
2127a98667 Switch open() for salt.utils.fopen() 2014-11-26 17:52:46 +00:00
Pedro Algarvio
9230f5b5ee Switch open() for salt.utils.fopen() 2014-11-26 17:50:47 +00:00
Pedro Algarvio
753338e078 Switch open() for salt.utils.fopen() 2014-11-26 17:49:27 +00:00
Pedro Algarvio
2a597da207 Switch open() for salt.utils.fopen() 2014-11-26 17:47:05 +00:00
Pedro Algarvio
6b72255e9b Switch open() for salt.utils.fopen() 2014-11-26 17:46:13 +00:00
Pedro Algarvio
5dfddc88a4 Switch open() for salt.utils.fopen() 2014-11-26 17:39:49 +00:00
Pedro Algarvio
0723b24feb Switch open() for salt.utils.fopen() 2014-11-26 17:39:18 +00:00
Thomas S Hatch
d416b8b1b8 gix tornado merge conflict 2014-11-26 09:25:47 -07:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
 2014-11-26 09:24:24 -07:00
Pedro Algarvio
50c437f8c5 Use atexit for the cleanup 2014-11-26 00:41:02 +00:00
Pedro Algarvio
593544b577 Move cleanup_runtime_config_instance out of TestDaemon 2014-11-26 00:20:27 +00:00
rallytime
eeab98c3be Skip tornado tests if we can't import ZMQIOLoop 
Tornado tests were failing on Ubuntu 10 and 12 because they don't have
a new enough version of PyZMQ to use the ioloop.current function.
 2014-11-25 13:06:33 -07:00
Mike Place
1daa9a4d69 Fix failing test in develop 
Add progress
 2014-11-25 10:31:27 -07:00
Thomas S Hatch
93ddc68b9a Merge pull request #18454 from rallytime/cmd_unittests 
Started some unit tests for the cmdmod.py module
 2014-11-25 09:35:40 -07:00
Thomas S Hatch
b83ab14c01 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/file.py
 2014-11-25 09:29:58 -07:00
Mike Place
4451833a6b Merge pull request #18292 from cachedout/fix_runners 
If we want returns, maybe we shouldn't exit first
 2014-11-25 09:12:41 -07:00
starzyk1
d6b5b58280 Fixes of pylint violations 2014-11-25 14:22:30 +01:00
starzyk1
4bdede0700 Fixes of pylint violations 2014-11-25 12:49:14 +01:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00