Michael Steed
|
83a96367a4
|
Manual merge of #24414 per thatch45
|
2015-06-06 07:47:52 -06:00 |
|
Colton Myers
|
baf4337918
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
|
2015-06-03 13:47:08 -06:00 |
|
Nicholas Capo
|
e7328e7043
|
Fix #18966 file.serialize correctly set result on test=True
* Use file.check_managed_changes to diff the file when test=True
|
2015-06-02 15:50:28 -05:00 |
|
Colton Myers
|
c4f5e231fa
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
|
2015-05-29 15:10:13 -06:00 |
|
Colton Myers
|
116b88dac3
|
Fix mocking in file state unit tests
|
2015-05-27 14:55:34 -06:00 |
|
Justin
|
5f0e601589
|
Fixed error where file was evaluated as a symlink in test_absent
|
2015-05-27 11:08:50 -06:00 |
|
Jayesh Kariya
|
7d59deb3d6
|
adding states/file unit test case
|
2015-05-23 22:22:32 -06:00 |
|
rallytime
|
cdc8039b58
|
Add some mocked variables to fix the file_test failures
Also do a little clean up of states/file.py and salt/state.py
|
2015-01-26 14:11:56 -07:00 |
|
Gareth J. Greenaway
|
823575c901
|
Unit tests for file state broke after adding the follow_symlnks argument. Tests were looking for a value in a specific position in a dictionary which has been pushed back one value. Also fixing an issue that happened if the file being managed by the module is a symlink, file would be treated as a new file.
|
2014-05-14 11:30:28 -07:00 |
|
Pedro Algarvio
|
18d969a674
|
Adapt the test to the changes made in 3c284b1b6.
|
2014-04-27 12:35:07 +01:00 |
|
Pedro Algarvio
|
640de961ac
|
A new argument was added to the call, adjust.
|
2014-04-08 15:38:22 +01:00 |
|
Pedro Algarvio
|
abedf1978e
|
Remove unused imports
|
2014-02-08 08:08:16 +00:00 |
|
Pedro Algarvio
|
d02a2bc224
|
Include the python encoding file header on tests.
|
2013-11-27 11:19:24 +00:00 |
|
Pedro Algarvio
|
55e0290da6
|
Fix the mocked contents pillar file state tests.
|
2013-11-12 07:55:03 +00:00 |
|
Pedro Algarvio
|
4c84b1da3e
|
State unit tests need to have an hardcoded __env__.
|
2013-11-06 20:04:54 +00:00 |
|
Henrik Holmboe
|
77fd1acb7f
|
Change assertEquals to assertEqual
According to
http://docs.python.org/2/library/unittest.html#deprecated-aliases
assertEquals is a deprecated alias of assertEqual.
|
2013-10-24 11:39:04 +02:00 |
|
Seth House
|
bd897c0bdb
|
Add unit test for the "python" jinja filter
Missing from c91fe1c (pull req #7866).
|
2013-10-16 09:24:40 -06:00 |
|
Pedro Algarvio
|
ef29861ff3
|
Adapted unit.states.file_test to use salttesting.mock
|
2013-08-26 13:03:07 +00:00 |
|
Pedro Algarvio
|
2b0bc7056e
|
Under python 2.6 using {}.format()(without an index) is a ValueError.
|
2013-08-06 19:29:08 +01:00 |
|
Roberto Aguilar
|
74be66baca
|
Added tests for file.managed contents_pillar param
|
2013-08-04 22:09:37 -07:00 |
|
Xavier Barbosa
|
3f49000ba2
|
unittesting for file.serialize and yaml & json filters
|
2013-07-08 16:19:19 +02:00 |
|