Commit Graph

43825 Commits

Author SHA1 Message Date
Thomas S Hatch
a3f1f66675 Merge pull request #19125 from nmadhok/add-src-to-gitignore
Adding src folder to .gitignore to Ignore commiting unit test runs
2014-12-19 14:27:12 -07:00
Nitin Madhok
a833d89b2c Redoing some changes 2014-12-19 14:14:46 -07:00
Nitin Madhok
588ffdace6 Correctly convert command list into string and do not error if conf file missing. Fixes #19117 2014-12-19 14:14:46 -07:00
Nitin Madhok
09b11bf8e4 Access dictionary values correctly in salt.modules.mdadm.destroy Fixes #19115 2014-12-19 14:14:46 -07:00
Lendar
8a885fc38f Fix PUT/DELETE in s3.query
Was broken in 8ed7c92 during move to requests.

- PUT now uploads data
- Fixes AttributeError
2014-12-19 14:07:16 -07: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
Thomas S Hatch
acbe79652f Merge pull request #19116 from nmadhok/module-mdadm-destroy
Access dictionary values correctly in salt.modules.mdadm.destroy
2014-12-19 14:03:20 -07:00
Thomas S Hatch
2fadac5706 Merge pull request #19104 from whiteinge/salt-fix-highstate-output-jobs-runner
Used unused variable; fix highstate output for jobs runner
2014-12-19 14:02:00 -07:00
Mike Place
14c9157676 Merge pull request #19142 from cachedout/vt_test_sleep
Increasing sleep to see if it fixes vt test
2014-12-19 14:01:50 -07:00
Mike Place
a931dd63fe Increasing sleep to see if it fixes vt test 2014-12-19 14:01:20 -07:00
Thomas S Hatch
b721203ed1 Merge pull request #19141 from thatch45/skylerberg-six-version-requirement
Merge #19101 with fixes
2014-12-19 13:59:14 -07:00
Thomas S Hatch
6a2edbc5af remove six dep, we bundle it now 2014-12-19 13:57:55 -07:00
Mike Place
22711eec20 Merge pull request #19140 from cachedout/dev_lint
Lint fixes for key.py and utils/network.py
2014-12-19 13:57:46 -07:00
Thomas S Hatch
88a109c7b5 Merge branch 'six-version-requirement' of https://github.com/skylerberg/salt into skylerberg-six-version-requirement 2014-12-19 13:57:31 -07:00
Mike Place
cde37d2523 Lint fixes for key.py and utils/network.py 2014-12-19 13:56:57 -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
74b9bf69dd Fixing salt.modules.mdadm.create and correcting incorrect code. Fixes #18991 2014-12-19 13:55:06 -07:00
Mike Place
6b085d1052 Ignore pylint warning W1202 2014-12-19 13:47:03 -07:00
Wolodja Wentland
c2715dc38e Ensure aptpkg._consolidate_repo strips trailing slashes from repo_uri
This fixes #18909
2014-12-19 13:34:56 -07:00
Ryan Lane
67f01999e2 Fix issue in boto_secgroup state that caused rules to not be properly updated 2014-12-19 12:29:13 -08:00
Mike Place
91edd75a03 Merge pull request #19106 from jfindlay/split_win
Split windows commands
2014-12-19 13:11:20 -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
Mike Place
74cbd8f84f Merge pull request #19113 from garethgreenaway/19003_2014_7_bind_mounts
Fixes for when using bind mounts.
2014-12-19 11:55:48 -07: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
0d98980dc4 Merge pull request #19133 from cachedout/remove_sed_tests
Remove deprecated tests
2014-12-19 11:38:40 -07: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
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
Mike Place
e77218cdd4 Merge pull request #19109 from cachedout/get_url_return
Allow the get_url fileclient to return the request contents
2014-12-19 10:16:19 -07:00
Thomas S Hatch
0febf11678 Merge pull request #19093 from thatch45/rdutch-patch-2
Merge #19089
2014-12-19 10:16:02 -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
Mike Place
4f29f4df16 Merge pull request #19098 from cachedout/preserve_minion_cache_flag
Preserve minion cache flag
2014-12-19 10:13:41 -07:00
Mike Place
63d5dda0a8 Merge pull request #19128 from syphernl/feature/add_in_network
Function to check whether a given IP is in a given subnet
2014-12-19 10:08:14 -07:00
Mike Place
e919e187e8 Merge pull request #19111 from jfindlay/split_choc
Split chocolatey commands
2014-12-19 10:01:08 -07:00
Mike Place
9fac2799f3 Merge pull request #19126 from syphernl/feature/add_iprev_to_network
Add IP reversal to network module
2014-12-19 09:51:07 -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
Mike Place
86af5a0c91 Merge pull request #19110 from rallytime/pip_state_fixes
Don't throw away package install error messages
2014-12-19 09:32:17 -07:00
Nicole Thomas
72b18519a9 Merge pull request #19119 from nmadhok/fix-lint
Changing permissions of test files and fixing lint violations
2014-12-19 09:28:27 -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