C. R. Oldham
f171df4311
Merge forward 2015.2->develop
2015-03-01 19:54:22 -07:00
Erik Johnson
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Erik Johnson
5573b18624
Fix more py3-incompatible print statements
2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14
Lint fix
2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af
Merge pull request #21160 from terminalmage/lint-2015.2
...
Don't use print statement without parenthesis (py3 compat)
2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f
update test_valid_docs
2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4
Don't use print statement without parenthesis (py3 compat)
...
This backports a lint fix from #21158 into the tests for 2015.2.
2015-02-28 11:41:51 -06:00
C. R. Oldham
1ff3192c20
Fileserver lists return lists
2015-02-27 17:24:25 -07:00
rallytime
b01196e7e8
Add transport key to mocked opts to fix batch unit tests
2015-02-27 14:53:58 -07:00
Mike Place
14592ed1f9
Adjust batch test
2015-02-27 14:53:58 -07:00
rallytime
eceadb82b1
Move tearDown functionality into test_instance
...
The new functions don't need to perform the tearDown behavior,
so that insurance should just be moved the function that needs it.
2015-02-27 14:53:54 -07:00
rallytime
14f4d28cd6
Add some more tests to catch API changes for digital ocean
2015-02-27 14:53:54 -07:00
Justin Findlay
68f06aae51
add integration test for #18317
2015-02-27 14:53:53 -07:00
Justin Findlay
3b7ba92089
adding cmd.run integration tests
2015-02-27 14:53:53 -07:00
Nicole Thomas
c2ca579906
Merge pull request #20965 from rallytime/joyent_cloud_tests
...
Add Joyent cloud provider tests
2015-02-27 14:42:08 -07:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
rallytime
cd5ad52c2e
Fix pylint errors on develop
2015-02-26 09:43:52 +00:00
Pedro Algarvio
38ddbbc227
Fix imports
2015-02-26 09:41:22 +00:00
Pedro Algarvio
a24ae29ee9
Revert "We no longer warn."
...
This reverts commit 5d35f856ac
2015-02-26 09:41:22 +00:00
Justin Findlay
581247f4b5
fix ssh test error
...
introduced by #21006
2015-02-25 15:27:03 -07:00
Mike Place
b4bd491f8e
Merge pull request #20981 from makinacorpus/psql
...
postgres: role update support
2015-02-25 09:35:15 -07:00
Mike Place
dd17969b7b
Merge pull request #21018 from jayeshka/win_ntp-unit-test
...
adding win_ntp unit test case
2015-02-25 09:19:37 -07:00
Jayesh Kariya
d7a0ca956d
adding win_shadow unit test case
2015-02-25 18:48:05 +05:30
Jayesh Kariya
5e851b3789
adding win_ntp unit test case
2015-02-25 18:46:45 +05:30
jfindlay
35f1266c86
Merge pull request #20968 from jayeshka/win_firewall-unit-test
...
adding win_firewall unit test case
2015-02-24 16:23:40 -07:00
rallytime
95d4fb801c
Skip the ec2 nightly cloud tests for now
...
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
2015-02-24 16:07:23 -07:00
Mathieu Le Marec - Pasquet
126e29c3eb
pgsql: fix tests
2015-02-24 21:01:13 +01:00
Thomas S Hatch
cd072876b7
Merge pull request #20942 from cachedout/context_cache
...
Context cache
2015-02-24 11:30:11 -07:00
rallytime
e26cac4599
Pylint fix
2015-02-24 10:58:39 -07:00
Jayesh Kariya
d5b70b5fea
adding win_firewall unit test case
2015-02-24 18:58:55 +05:30
jfindlay
a38c17efde
Merge pull request #20901 from aspyatkin/feature-bower
...
Add Bower execution and state modules
2015-02-23 21:40:10 -07:00
Mike Place
26b3ec0be3
Context cache decorator
2015-02-23 19:27:27 -07:00
Justin Findlay
ebc6a1f4c8
fix matcher tests for 2015.2->develop merge
2015-02-23 15:39:44 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
rallytime
0e57d8fe6e
Fix pylint errors on develop
2015-02-23 12:24:53 -07:00
rallytime
c0cad91549
Fix unit test
2015-02-21 19:29:57 -07:00
Pedro Algarvio
c85d38c493
Merge pull request #20893 from cvrebert/pylint-enable
...
re-enable pylint instead of disabling it twice
2015-02-21 08:29:16 +00:00
Chris Rebert
ea02ef58b7
re-enable pylint instead of disabling it twice
2015-02-20 23:50:30 -08:00
Alexander Pyatkin
5edb6cba11
Implement Bower state module
2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0
Implement Bower execution module
2015-02-21 05:56:20 +00:00
Chris Rebert
2a52d54a20
Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120
2015-02-20 21:52:25 -08:00
rallytime
b51492486f
Add Joyent cloud provider tests
2015-02-20 17:25:07 -07:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
Jayesh Kariya
014ce111ab
adding win_autoruns unit test case
2015-02-20 19:16:09 +05:30
jfindlay
ca79845b2f
Merge pull request #20848 from rallytime/new_requisites_tests
...
Integration tests for the new requisites added in 2014.7
2015-02-19 18:29:00 -07:00
rallytime
c3f786c966
listen and listen_in requisite tests
2015-02-19 16:13:23 -07:00
rallytime
1437c9a1f5
onfail and onfail_in requisite tests
2015-02-19 14:35:26 -07:00
rallytime
208b4906d8
Onchanges and onchanges_in requisite tests!
2015-02-19 13:06:38 -07:00
jfindlay
b70ffe2bb8
Merge pull request #20819 from jayeshka/slack_notify-unit-test
...
adding slack_notify unit test case
2015-02-19 08:21:30 -07:00
Jayesh Kariya
93d5a32bd8
adding rpm unit test case
2015-02-19 14:40:10 +05:30
