Mike Place
427f6f7cad
Fix failing unit test
2016-01-22 10:54:25 -07:00
Mike Place
d09e69f3fc
Merge pull request #30057 from abednarik/virtual_ret_parted_module
...
modules.parted: __virtual__ return err msg.
2015-12-30 08:57:55 -07:00
rallytime
c386d70742
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/modules/alternatives.py
- salt/modules/boto_rds.py
- salt/modules/mount.py
- salt/states/boto_iam.py
2015-12-29 15:51:12 -07:00
abednarik
c1be5a61fa
modules.parted: __virtual__ return err msg.
...
Updated message when module is not supported based on systems or available binaries.
2015-12-29 16:55:48 -03:00
Mike Place
bad6daca93
Merge pull request #30049 from rallytime/esxi-unit-tests
...
Add some more unit tests for the vsphere execution module
2015-12-29 10:07:41 -07:00
Mike Place
e915f4b591
Merge pull request #30053 from akissa/add-postgres-privileges-support
...
Add postgres privileges support
2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
7be5eebfc7
add postgres_privileges state module tests
2015-12-29 12:57:21 +02:00
Andrew Colin Kissa
efcfb611b2
added postgres execution privileges tests
2015-12-29 10:59:48 +02:00
rallytime
1a83147986
Remove unnecessary import block
2015-12-28 16:14:13 -07:00
rallytime
695107ae6e
Add some more unit tests for the vsphere execution module
...
And fix a coupl of small bugs found in the module through testing
2015-12-28 16:11:33 -07:00
Mike Place
5cfda08b39
Merge pull request #29970 from sjorge/module-zfs
...
salt.modules.zfs
2015-12-28 14:38:37 -07:00
Mike Place
28e01aa8ac
Merge pull request #30018 from gladiatr72/pip_state__handle_requirements_chaining
...
Pip module/state -- handle requirements chaining
2015-12-28 14:28:00 -07:00
Jorge Schrauwen
4bad71c60d
lint fixes
2015-12-28 19:48:51 +00:00
Andreas Lutro
ca290ec3e1
change how alternatives states check for installed
2015-12-28 12:31:19 -07:00
Stephen D. Spencer
18b4b829e9
. adjust regex to account for the presence/absence of version strings on
...
module names (depends on whether or not they're used in the requirements
file)
. finish generalizing pip_successful_install utility function
2015-12-28 18:48:16 +00:00
Stephen D. Spencer
7373758237
fix indentiation
2015-12-28 18:02:24 +00:00
Stephen D. Spencer
22e89838f2
testing against stdout of a cli utility is for the birds. But I think
...
these tests are properly capturing "Success" messages from pip
c.2013-c.2015
2015-12-28 17:19:05 +00:00
Stephen D. Spencer
4ccfa921b3
add re.DOTALL flag to regex
2015-12-28 15:57:55 +00:00
Stephen D. Spencer
e0da7cddf6
modules.pip:
...
adjust (actual) current directory bits
tests.unit.modules.pip_test:
adjust mock's expectations of cwd=None always being passed (?)
2015-12-28 09:37:39 +00:00
Stephen D. Spencer
84031b6ce0
additional integration tests to verify chained requirements work
...
properly when used in a list of requirements files
2015-12-28 09:30:19 +00:00
Andrew Colin Kissa
2e836a3f75
postgres_privileges skeleton
2015-12-27 12:01:20 +02:00
Stephen D. Spencer
878def94fd
pip,requirements filej chain support + requirements list arg support
...
modules.pip:
. `requirements` argument now properly supports requirements file
chaining by default--`no_chown` not required)
. `requirements` argument can be formed as a list
. `requirements` files can still be formed as a comma-delimited list
. both list structures support requirements file chaining
states.virtualenv_mod:
. had to give states.virtualenv.managed() a little bit of attention to
provide a cwd argument for modules.pip.installed(). This is done via
os.path.dirname(os.path.abspath(requirements)) if a requirements
argument is present
tests.integration.modules.pip:
. added:
test_requirements_as_list__sans_no_chown___absolute_file_path
test_requirements_as_list__sans_no_chown___non_absolute_file_path
test_chained_requirements__sans_no_chown___absolute_file_path
test_chained_requirements__sans_no_chown___non_absolute_file_path
. all tests passed before commit
2015-12-26 21:30:27 -06:00
Andreas Lutro
4c9d893f98
change how alternatives states check for installed
2015-12-26 22:48:29 +01:00
Jorge Schrauwen
e1445d42e9
update unit tests for new error messages
2015-12-26 10:28:25 +00:00
Jorge Schrauwen
bc15891944
added unit test for zfs.get
2015-12-24 00:07:36 +00:00
Jorge Schrauwen
59efba23aa
added test for zfs.set
2015-12-23 23:22:09 +00:00
Jorge Schrauwen
87f27d206c
added unit tests for zfs.snapshot
2015-12-23 22:44:19 +00:00
Jorge Schrauwen
0a1dbeda53
added unit tests for zfs.release, fixed unit test for zfs.hold
2015-12-23 22:06:44 +00:00
Jorge Schrauwen
9db9843bae
added unit tests for zfs.hold
2015-12-23 21:50:01 +00:00
Jorge Schrauwen
596c991c0b
added unit tests for zfs.holds
2015-12-23 21:16:45 +00:00
Jorge Schrauwen
26c00bf402
added unit test for zfs.bookmark, probably need to revisit this once the error messages are more useful. Now they all seem to return unknown error from the upstream command
2015-12-23 20:12:07 +00:00
Jorge Schrauwen
f2dccea3d1
add unit test for zfs.promote
2015-12-23 17:19:34 +00:00
Jorge Schrauwen
b7314cd186
add unit test for zfs.clone
2015-12-23 17:06:22 +00:00
Jorge Schrauwen
032f17cfd1
implement unit tests for zfs.rollback
2015-12-23 16:48:24 +00:00
Jorge Schrauwen
c15affe227
add unit test for zfs.diff
2015-12-23 16:20:32 +00:00
Jorge Schrauwen
0d8fd711b5
add unit tests for zfs.inherit
2015-12-23 15:59:50 +00:00
Jorge Schrauwen
959828a9dd
add unit tests for zfs.unmount
2015-12-23 15:36:33 +00:00
Jorge Schrauwen
11b986e715
unit test for zfs.list
2015-12-23 15:20:51 +00:00
Jorge Schrauwen
3cbc6befbe
update unit tests for zfs.mount
2015-12-23 15:14:45 +00:00
Jorge Schrauwen
388f928851
unit test for zfs module should accept new output
2015-12-23 12:47:41 +00:00
Jorge Schrauwen
95a1668bc1
fix type in test data
2015-12-22 21:21:07 +00:00
Mike Place
c19782a184
Merge pull request #29853 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-12-22 08:05:49 -07:00
Mike Place
62c9514108
Merge pull request #29881 from sjorge/module_zpool
...
rework salt.module.zpool
2015-12-21 14:51:10 -07:00
Jorge Schrauwen
1ca3757782
tests now cover most commands that query data
2015-12-21 20:44:10 +00:00
Jorge Schrauwen
08b65e79ac
add a few more unit tests
2015-12-21 20:40:28 +00:00
Jorge Schrauwen
37ac0df4e3
also test zpool.status
2015-12-21 20:19:03 +00:00
Jorge Schrauwen
21ee4b71b6
also do negative test
2015-12-21 20:07:48 +00:00
Jorge Schrauwen
28c4d28446
attempt to fix unit test
2015-12-21 19:49:40 +00:00
Mike Place
fa7dead492
Merge pull request #29901 from cachedout/fixup_29863
...
Fixup 29863
2015-12-21 11:26:00 -07:00
Mike Place
0d7ef0e95c
Fix broken tests
2015-12-21 11:25:18 -07:00