Andreas Lutro
7c69c177ed
update test
2015-12-09 13:18:47 +01: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
Mike Place
7efd6dd140
Merge pull request #29399 from jfindlay/second_up
...
modules.status: add human_readable option to uptime
2015-12-07 12:53:52 -07:00
Justin Findlay
48e7beb0eb
modules.status: add in_seconds option to uptime
...
Implements #29311 .
2015-12-04 18:52:59 -07:00
Mike Place
d2c0fcbc97
Merge pull request #29398 from cachedout/lint_29288
...
Lint 29288
2015-12-03 11:03:53 -07:00
Mike Place
3b0033e529
Lint #29288
2015-12-03 11:02:49 -07:00
Mike Place
6a7a95f28a
Merge pull request #28501 from twangboy/jmoney_26898
...
Requested fixes for 26898
2015-12-02 18:12:12 -07:00
Mike Place
17d80c051a
Merge pull request #29334 from rallytime/bp-29237
...
Back-port #29237 to 2015.8
2015-12-02 12:37:31 -07:00
Mike Place
5ec7947595
Merge pull request #29300 from ticosax/dockerng-volumes
...
[dockerng] Add support for volume management in dockerng
2015-12-02 10:48:53 -07:00
Nicolas Delaby
cb9cb463b0
Provide states for managing docker volumes
2015-12-02 17:27:20 +01:00
Nicolas Delaby
dff6fa1fb2
Add execution module to manage docker volumes
2015-12-02 17:27:20 +01:00
Jorge Schrauwen
598226def1
fix unit test (attempt 1)
2015-12-02 08:34:59 -07:00
Mike Place
99b7d87688
Merge pull request #29218 from clan/service_state
...
check service enable state in test mode
2015-12-02 08:31:00 -07:00
Mike Place
39667fda12
Merge pull request #29240 from clan/linux_acl
...
handle acl_type [[d]efault:][user|group|mask|other]
2015-12-01 10:56:20 -07:00
Justin Findlay
4d6c71aa80
modules.glusterfs: fix start_volume unit test
2015-12-01 10:53:32 -07:00
Z. Liu
a1250a9729
check service enable state in test mode
2015-12-01 15:02:00 +08:00
Z. Liu
02429aca69
handle acl_type [[d]efault:][user|group|mask|other]
2015-12-01 14:55:08 +08:00
Mike Place
8d32d8d43d
Merge pull request #29264 from alprs/fix-ssh_auth_absent_test
...
Prevent ssh_auth.absent from running when test=True
2015-11-30 14:54:15 -07:00
Mike Place
87e4aa4fae
Merge pull request #28994 from timcharper/2015.8.1-dev
...
add support to s3 for aws role assumption
2015-11-30 13:52:17 -07:00
Mike Place
d651d7167e
Merge pull request #29067 from jacksontj/2015.8
...
Fix infinite recursion in state compiler for prereq of SLSs
2015-11-30 13:27:09 -07:00
Andreas Lutro
9193676f9c
fix ssh_auth_test
...
there were 4 side_effect return values, when it should only return 2
times - 2 of the 4 states.ssh_auth.absent calls are done with test=True
test=True and should therefore not call modules.ssh.rm_auth_key
2015-11-30 20:13:52 +01:00
Tim Harper
e060986828
add support to s3 for aws role assumption
2015-11-28 00:57:45 -07:00
Bastiaan Bakker
5226cd8f79
remove trailing whitespace
...
fix subdict_match test cases
2015-11-25 20:41:13 -07:00
Bastiaan Bakker
44713cdb95
fix issue 29191: only try partial matches when a wildcard has been specified
2015-11-25 20:41:13 -07:00
Mike Place
2477ff2eab
Add __init__ and pydsl test
2015-11-25 10:50:30 -07:00
Mike Place
063f075a99
Add integration renderer tests to the suite
2015-11-25 10:14:46 -07:00
Mike Place
81bf332be4
Migrate pydsl tests to integration test suite
...
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.
The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
2015-11-24 15:46:14 -07:00
Mike Place
68d6c454b8
Merge pull request #29141 from optix2000/full_sls_import
...
Add test case for require: sls with only import statements
2015-11-24 09:17:57 -07:00
Nicolas Delaby
e98d18ba41
Expose docker networking as state
2015-11-24 13:55:22 +01:00
Nicolas Delaby
17ff5c1ab5
Add expose networking to modules.dockerng
2015-11-24 13:55:22 +01:00
Weilu Jia
596843e8d6
Add test case for sls with only import
...
Tests https://github.com/saltstack/salt/issues/10852
2015-11-23 18:27:56 -08:00
Weilu Jia
64e439cda2
Add test for infinite recursion with sls prerequisites
2015-11-23 09:12:06 -08:00
Mike Place
714ef8ff27
Merge pull request #29057 from lyft/file-manage-local-source-list
...
Add local file support for file.managed source list
2015-11-19 14:57:34 -07:00
Mike Place
b692ab1cfb
Merge pull request #29047 from schwing/fix-gpg-exception
...
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
2015-11-19 12:07:36 -07:00
John Schwinghammer
813f6e6808
Fix 'GPG_1_3_1 referenced before assignment'
...
- Fix gpg.import_key() exception:
"local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
2015-11-19 09:27:46 -06:00
Paul Fisher
d175061c5d
Add tests for file.source_list with local files
2015-11-18 15:55:44 -08:00
Justin Findlay
0c0bce3ea6
cache runner test: add new unit tests
2015-11-18 16:33:46 -07:00
Mike Place
1e9214f4e4
Merge pull request #28787 from chrigl/fix-28784
...
closes #28784
2015-11-17 08:54:04 -07:00
Mike Place
5b680c938a
Merge pull request #28950 from DSRCompany/pr/28812_which
...
PR 28812 which test fix
2015-11-17 08:32:16 -07:00
Dmitry Kuzmenko
18571000c5
Fix which test in PR#28812
2015-11-17 11:29:41 +03:00
Christoph Glaubitz
8639e3e9c3
closes #28784
...
In fact this test will fail on the current code, but that is like
intended. This tests the fix of #28783 , which was introduced in 2015.5.
2015-11-16 20:30:37 +01:00
Justin Findlay
5ce61abf57
rewrite GPG unit tests
2015-11-16 09:36:29 -07:00
Justin Findlay
e32a9aab85
rh_service._chkconfig_is_enabled unit tests
2015-11-13 23:38:40 -07:00
Mike Place
785bf94f55
Add transport setting to shell test
2015-11-12 14:32:39 -07:00
Mike Place
8d3244166b
Cast to dict to fix wheel tests in tcp
2015-11-12 12:21:52 -07:00
Colton Myers
224602437a
Merge pull request #28804 from cachedout/tcp_test_fixes
...
TCP test fixes
2015-11-12 11:39:25 -07:00
Todd Tomkinson
ba94878f45
marathon and chronos proxy minions
2015-11-12 10:03:38 -07:00
Mike Place
9b18f372e6
Normalize IPC check among transports
2015-11-11 16:26:32 -07:00
twangboy
c0cf33332c
Fixed some Lint...
2015-11-11 14:27:06 -07:00
