Nitin Madhok
57c103d70e
Adding more unit tests
2015-08-13 10:44:46 -04:00
Nitin Madhok
020994bb07
Fix lint
2015-08-13 09:30:27 -04:00
Nitin Madhok
5b05740dd4
Adding additional unit tests
2015-08-13 09:27:42 -04:00
Nitin Madhok
a88be9f756
Splitting asserts in multiple line for readability
2015-08-13 07:27:16 -04:00
Nitin Madhok
af4c058bd8
Adding more unit tests for vmware cloud driver
2015-08-13 07:07:11 -04:00
Nitin Madhok
e687434b0c
Adding more unit tests for create_datacenter and create_cluster
2015-08-13 02:10:43 -04:00
C. R. Oldham
7fc3232633
Merge 2015.8 forward to develop (get ldap fix)
2015-08-12 11:37:04 -06:00
Nicole Thomas
6730990bbc
Merge pull request #26248 from nmadhok/vmware-cloud-test-2015.8
...
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:59:15 -06:00
Colton Myers
1c661abc91
Skip failing event tests
...
@driskell it would be great if you could fix these up when you do your
2015.8 refactor
2015-08-12 10:15:11 -06:00
Nitin Madhok
fd7c365999
Lint Fix
2015-08-12 10:48:10 -04:00
Nitin Madhok
f0c2b9c5ef
Lint fix
2015-08-12 10:47:10 -04:00
Nitin Madhok
416a95cad6
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:44:20 -04:00
Nitin Madhok
7c33f0ad54
Initial commit of unit tests for vmware cloud driver
2015-08-12 10:33:42 -04:00
Colton Myers
426b1631c6
Remove stray subscribe
2015-08-11 23:12:18 -06:00
Colton Myers
110cae3cdc
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
2015-08-11 18:14:31 -06:00
Colton Myers
1502a39779
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
conf/minion
salt/client/__init__.py
salt/states/dockerio.py
salt/utils/event.py
tests/unit/utils/event_test.py
2015-08-11 18:12:21 -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
f39780f8ce
Merge pull request #26000 from driskell/fix_discarded_events
...
Implement full event caching for subscribed tags
2015-08-10 12:57:17 -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
8b89e46f53
Merge pull request #26118 from rallytime/one-testing
...
Wrote even more unit tests for the OpenNebula driver
2015-08-08 15:11:39 -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
bbc6f84c75
Merge pull request #26105 from cachedout/fix_25221
...
Fix failing test
2015-08-07 12:11:10 -06:00
Mike Place
1a18013330
Fix failing test
2015-08-07 12:10:40 -06:00
Mike Place
c5e1f5bee6
Merge pull request #25221 from jet9/istextfile_utf8
...
Extend salt.utils.istextfile() with detection of utf-8 content instead of binary
2015-08-07 12:10:27 -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
