Justin Findlay
08493d85fd
states.file unit tests: mark tests destructive for touching file
2016-03-10 10:57:20 -07:00
Justin Findlay
7a8061cc1e
states.file unit tests: use existing file for unmocked tests
2016-03-10 10:57:20 -07:00
Erik Johnson
cf2ce95e61
Update test to reflect new position of contents param
...
The addition of the new skip_verify argument to
salt.modules.file.manage_file() means that the position of contents
param in returner.call_args[0] has changed. This commit updates this
test to reflect the new position.
Additionally, a comment has been added to hopefully make failures in
this test easier to grok for people moving forward.
2016-02-17 20:54:44 -06:00
rallytime
39b49621ad
Merge branch '2015.8' into 'develop'
...
Conflicts:
- salt/beacons/service.py
- salt/cloud/clouds/vmware.py
- salt/modules/file.py
- salt/modules/ipset.py
- salt/modules/npm.py
- salt/modules/rpm.py
- salt/states/file.py
- salt/utils/event.py
- salt/utils/schedule.py
- tests/unit/modules/state_test.py
2016-01-14 13:33:53 -07:00
Mike Place
dcfba51556
Lint
2016-01-13 10:42:03 -07:00
Mike Place
b9921128af
Kill pointless tests
2016-01-13 10:15:26 -07:00
Mike Place
63c157d0a3
Fix test_managed
2016-01-13 09:54:33 -07:00
Justin Findlay
45acd05065
state.file: add file.mkdir to unit test mock
2015-12-08 16:33:33 -07:00
Justin Findlay
aa393a4831
state.file: add pchanges to unit test mock
2015-12-08 16:33:07 -07:00
Colton Myers
7918736656
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/client/ssh/ssh_py_shim.py
salt/modules/dracr.py
salt/states/boto_vpc.py
tests/unit/states/file_test.py
2015-12-08 14:46:23 -07:00
Colton Myers
e59364ad1d
Fix failing unit test
2015-12-08 13:45:34 -07:00
Colton Myers
9673fd0937
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/ec2.py
tests/unit/states/file_test.py
2015-12-08 12:23:26 -07:00
Mark McGuire
f0a60b33e2
Use changes in #28926
2015-11-17 10:54:19 -06:00
twangboy
c0cf33332c
Fixed some Lint...
2015-11-11 14:27:06 -07:00
Justin Findlay
bc7e0cfe64
add file.symlink unit tests
2015-11-11 13:37:47 -07:00
Justin Findlay
9381dc7215
orthogonalize file.symlink unit tests
2015-11-11 13:37:18 -07:00
Mike Place
5293150d25
Fix tests
2015-11-05 08:29:55 -07:00
Colton Myers
32969b2408
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
salt/cloud/clouds/digital_ocean.py
salt/cloud/clouds/linode.py
salt/loader.py
salt/modules/blockdev.py
salt/modules/boto_route53.py
salt/modules/boto_vpc.py
salt/modules/bsd_shadow.py
salt/modules/file.py
salt/modules/rabbitmq.py
salt/modules/schedule.py
salt/modules/win_network.py
salt/runners/state.py
salt/spm/__init__.py
tests/unit/modules/blockdev_test.py
2015-11-02 18:19:01 -07:00
twangboy
7d39091c91
Fixed some more lint
2015-11-02 16:51:16 -07:00
twangboy
3dbd62af2c
Fixed some tests... hopefully
2015-11-02 16:13:07 -07:00
Andreas Lutro
a772ce330a
fix tests
2015-11-02 10:50:51 +01:00
Justin Findlay
9ec72ca724
fix file state unit tests for win symlink feature
2015-10-29 13:50:38 -06:00
twangboy
69c32a663e
Fixed some lint
2015-10-22 11:24:38 -06:00
twangboy
638dec5027
Fixed some tests... let's see if they're really are
2015-10-22 11:05:22 -06:00
Ronald van Zantvoort
46bf6d4fa3
Update file.serialize test for Python serialized
...
pprint.pformat seems non-reversible, so just add the newline there as well
2015-10-21 17:12:53 +02:00
Colton Myers
5628702dd2
lint
2015-08-27 14:41:31 -06:00
Colton Myers
4f441179aa
Test fixes
2015-08-27 14:11:34 -06:00
Colton Myers
e9674b541f
Another file_test fix
2015-08-27 14:08:14 -06:00
Colton Myers
ca3f40b94e
More test fixing
2015-08-26 19:32:31 -06:00
Colton Myers
a9cdb633a4
Fix failing test
2015-08-26 16:08:50 -06:00
Colton Myers
76c70162db
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/conf.py
doc/topics/spm/index.rst
salt/cloud/clouds/gce.py
salt/cloud/clouds/opennebula.py
salt/cloud/clouds/openstack.py
tests/unit/states/file_test.py
2015-08-26 14:47:33 -06:00
Colton Myers
ed940ad5f5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/gce.py
salt/cloud/clouds/openstack.py
tests/unit/modules/artifactory_test.py
tests/unit/modules/groupadd_test.py
tests/unit/modules/jboss7_test.py
tests/unit/states/jboss7_test.py
2015-08-25 13:55:44 -06:00
Erik Johnson
81a0d4c915
Skip tests that don't work with older mock
...
This fixes test failures on RHEL6 builds.
This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
2015-08-21 21:35:11 -05:00
Thomas S Hatch
2ddf5c4e58
lint
2015-08-08 20:17:45 -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
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
e29be766bb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/changelog
doc/man/salt.7
salt/cloud/__init__.py
salt/cloud/clouds/proxmox.py
salt/cloud/clouds/vmware.py
salt/config.py
salt/fileclient.py
salt/minion.py
salt/modules/chocolatey.py
salt/modules/localemod.py
salt/modules/pacman.py
salt/modules/pkgng.py
salt/modules/schedule.py
salt/modules/state.py
salt/modules/win_file.py
salt/modules/win_pkg.py
salt/state.py
salt/states/file.py
salt/utils/args.py
tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Mike Place
ada3a29e55
Fix broken test for file.copy
2015-07-28 09:57:49 -06:00
twangboy
a904e8329b
Fixed another test failure...
2015-07-27 15:05:23 -06:00
twangboy
aa077d3a86
Fixed more tests... justin findlay helped me...
2015-07-27 11:18:25 -06:00
twangboy
87c8f8dfb5
Fixed some tests... maybe...
2015-07-24 15:07:45 -06:00
Colton Myers
24d51fb8f1
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/ref/configuration/minion.rst
salt/config.py
salt/modules/sudo.py
tests/integration/states/file.py
2015-07-02 09:46:36 -06:00
Justin Findlay
937a252e16
remove unnecessary file state tests
2015-06-30 17:16:17 -06:00
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
