Nitin Madhok
416a95cad6
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:44:20 -04:00
Colton Myers
110cae3cdc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-11 18:14:31 -06:00
Mike Place
8ad37e0558
Remove debugger
2015-08-11 11:29:19 -06:00
Mike Place
05c21297de
Fix env ordering in merged list
2015-08-11 11:29:13 -06:00
Mike Place
8ca0e59891
Lint
2015-08-11 11:28:59 -06:00
Mike Place
cfb6982227
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-11 11:28:40 -06:00
Mike Place
889b4d2795
Merge pull request #24878 from cachedout/issue_12483
...
Top file enhancements
2015-08-11 11:24:46 -06:00
Mike Place
3a495133f8
Merge pull request #26193 from rallytime/one-testing
...
Add more unit tests to the OpenNebula driver
2015-08-11 09:24:16 -06:00
rallytime
a3b673cfca
Pylint fix
2015-08-11 09:23:28 -06:00
rallytime
14fe0b88af
Add more unit tests to the OpenNebula driver
2015-08-10 17:15:38 -06:00
Colton Myers
ee4b788745
Skip tests that require windows libraries if not present
2015-08-10 16:57:06 -06:00
Colton Myers
49fb19049b
Remove outdated heavily-mocked unit test
2015-08-10 16:54:17 -06:00
Colton Myers
1b0b21394e
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
Colton Myers
0fc16040d6
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/__init__.py
salt/cloud/clouds/vmware.py
salt/loader.py
salt/minion.py
salt/modules/archive.py
salt/modules/file.py
salt/states/pkg.py
salt/utils/http.py
2015-08-10 13:21:57 -06:00
Mike Place
2704094e21
Merge pull request #26125 from evverx/timedatectl-settz
...
Use timedatectl set-timezone to tzsetting if available
2015-08-10 08:43:41 -06:00
Erik Johnson
56798d724c
Fix comment in return value
2015-08-09 22:07:02 -05:00
Erik Johnson
18ebdd382a
Update winrepo tests with new param names
2015-08-09 21:19:45 -05:00
Evgeny Vereshchagin
694ba4d0c6
Check the tzname before the tzfiles hashsums
...
Fix #12654 , #24964
2015-08-09 07:24:18 +03:00
Thomas S Hatch
3d04960e71
Merge pull request #26134 from thatch45/pchanges2
...
Pchanges2
2015-08-08 21:04:34 -06:00
Evgeny Vereshchagin
e5eaf4686a
Use timedatectl set-timezone to tzsetting
...
Fixed #26122
2015-08-09 06:00:35 +03:00
Thomas S Hatch
2ddf5c4e58
lint
2015-08-08 20:17:45 -06:00
C. R. Oldham
28329fff55
These tests make no sense now that the proxy interface is module based and not object based.
2015-08-08 14:44:33 -06:00
Thomas S Hatch
912d6041f5
apply @cachedout's tests
2015-08-08 09:37:16 -06:00
Thomas S Hatch
0e705d2185
add pchanges docs
2015-08-08 09:32:29 -06:00
rallytime
8ae98b2bf4
Remaining template_* unit tests for OpenNebula
2015-08-07 16:34:05 -06:00
rallytime
fa58787227
Unit tests for vn_* functions for the OpenNebual driver
2015-08-07 16:10:55 -06:00
rallytime
7855a388e3
Wrote more unit tests for the OpenNebula driver
...
Also fixed a couple of minor bugs found along the way.
2015-08-07 15:12:04 -06:00
Mike Place
bebb337178
Remove debugger
2015-08-07 12:12:33 -06:00
Mike Place
246a9d790a
Fix env ordering in merged list
2015-08-07 11:45:11 -06:00
Mike Place
e1dd521d57
Lint
2015-08-07 10:43:19 -06:00
Mike Place
13d544b675
Adding some dictupdate merge tests
...
Add new option for top_file_merging_strategy to config
Add master config file option
Adding additional tests
Lexicographical test works
Make default strategy
Simplify to just an option about whether or not to merge
Changes
Implement ordered top files
Implement merge strategies and default top files
Lint
Doc rewrite and start on ordering
Remove debugging
Moving to env_order
Adding env_order
Still writing tests
More tests and docs
2015-08-07 10:43:19 -06:00
Mike Place
41fc026cff
Merge pull request #26072 from QuinnyPig/update-rvm
...
Updated rvm installer script link as per upstream
2015-08-07 08:56:19 -06:00
Mike Place
11fa9c3cc2
Merge pull request #26085 from rallytime/one-tests
...
Added more unit tests to OpenNebula driver
2015-08-07 08:33:11 -06:00
rallytime
a639c28050
Added more unit tests to OpenNebula driver
...
Also fixed some minor bugs found along the way.
2015-08-06 17:22:51 -06:00
Corey Quinn
d5cb70360f
Fixed to expanded URL
2015-08-06 13:14:39 -07:00
Corey Quinn
e4f78637a0
Updated rvm installer script link as per upstream
2015-08-06 11:47:30 -07:00
Justin Findlay
6c6f407f66
Merge pull request #26050 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-06 11:03:54 -06:00
rallytime
3811332a80
Add more OpenNebula unit tests
2015-08-05 16:42:14 -06:00
Colton Myers
d332d54eec
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-05 15:32:11 -06:00
Colton Myers
a4d4f8c5f8
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/linode.py
salt/modules/layman.py
salt/modules/win_system.py
2015-08-05 15:30:04 -06:00
rallytime
1b5a9bc91d
Pylint fix
2015-08-05 10:05:29 -06:00
twangboy
0502897635
Fixed the lint... again
2015-08-04 17:43:58 -06:00
twangboy
6f85d6b9af
Fixed some lint
2015-08-04 17:13:47 -06:00
rallytime
78ea0f246e
Started writing unit tests for OpenNebula driver
...
Also fixed up some inconsistencies and bugs found along the way
2015-08-04 16:45:09 -06:00
Justin Findlay
9156bbd33e
update win_system exec mod unit tests
2015-08-04 15:55:32 -06:00
Mike Place
85f5e2a443
Fix failing tests
2015-08-04 09:48:43 -06:00
Dmitry Kuzmenko
5c6276ac7d
Subscribe event to bus is optional now
...
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-08-03 16:10:38 -06:00
Colton Myers
d5fbd960fe
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/vmware.py
salt/fileserver/s3fs.py
salt/modules/chocolatey.py
salt/modules/s3.py
salt/modules/zpool.py
salt/pillar/s3.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
2015-08-03 15:01:35 -06:00
Colton Myers
4d8ba6b874
Remove reg unit tests, not applicable to latest version of reg module
2015-08-03 12:03:03 -06:00
Colton Myers
abf389743a
Merge pull request #25903 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-03 11:12:18 -06:00
