Justin Findlay
c69650aa5f
Merge pull request #24817 from rallytime/enable_gogrid_tests
...
Make the GoGrid Cloud Provider Tests work
2015-06-19 11:14:51 -06:00
Joseph Hall
d299475d34
Merge pull request #24796 from rallytime/deprecate_provider_for_driver
...
Deprecate using "provider" in favor of "driver" in cloud provider files
2015-06-19 09:43:26 -06:00
Christophe Drevet-Droguet
ed4d0646a4
unit tests for state grains: use a subdirectory for config file
...
This way, there is no /tmp/grains created on test execution. And the issue
with test_absent_delete is always triggered.
Maybe we should use mocked files, but I'm not sure how to do it.
2015-06-19 12:49:48 +02:00
Christophe Drevet-Droguet
ff5267b1b6
trying to fix jenkins error
...
There are many jenkins errors on linode CentOS7. The function `saltutil.sync_grains`
does not seem to be mocked correctly on this platform.
Based on 1f5836d0bb
2015-06-19 12:49:28 +02:00
Christophe Drevet-Droguet
650fa90b97
more complete unit tests for state grains
2015-06-19 09:20:23 +02:00
rallytime
4a0626bf27
Python 3 compat fix
2015-06-18 18:42:04 -06:00
rallytime
5c137c86ad
Make the GoGrid Cloud Provider Tests work
2015-06-18 17:08:57 -06:00
Mike Place
f3b06081fc
Lint win_status
2015-06-18 14:29:19 -06:00
Colton Myers
da8b637d4d
Merge pull request #24804 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-18 14:12:01 -06:00
rallytime
1e85bb9792
Fix bugs caught by tests, and clean up some of the tests
2015-06-18 14:02:13 -06:00
Mike Place
558ce63b31
Skip encoding tests if unsupported
2015-06-18 12:06:10 -06:00
Mike Place
72752f53ff
Fix failing zmq tests
...
This is just a stopgap to prevent the ioloop from shutting down before the procs die off.
2015-06-18 11:45:57 -06:00
Colton Myers
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/releases/version_numbers.rst
salt/cli/batch.py
salt/minion.py
salt/state.py
setup.py
2015-06-18 11:43:11 -06:00
C. R. Oldham
1a158e8a3b
Merge pull request #24792 from rallytime/bp-24757
...
Back-port #24757 to 2015.5
2015-06-18 09:58:35 -06:00
C. R. Oldham
0f9298263b
Merge pull request #24768 from jfindlay/pkg_mod
...
fix yum versionlock on RHEL/CentOS 5, disable corresponding test
2015-06-18 09:13:12 -06:00
Mike Place
6c804f0789
Fix loader call in pyobjects
2015-06-18 09:11:45 -06:00
Mike Place
fd7339014b
Merge pull request #24782 from jayeshka/slack-states-unit-test
...
adding states/slack unit test case.
2015-06-18 08:33:55 -06:00
Chris McMacken
3025ba1ec1
Adding a couple of tests for grant_exists
2015-06-18 08:00:23 -05:00
Jayesh Kariya
e2b6214764
adding states/slack unit test case.
2015-06-18 15:47:27 +05:30
Thomas Jackson
b1211c5422
Re-enable tests for complex prereq and prereq_in
...
Since #24770 is fixed, #8211 is also fixed (since they are basically the same issue)
2015-06-17 21:57:37 -07:00
Justin Findlay
7a26c2b5b9
disable pkg.hold test for RHEL/CentOS 5
2015-06-17 16:36:36 -06:00
Mike Place
a407ab7c51
Merge pull request #24329 from jayeshka/postgres_database-states-unit-test
...
adding states/postgres_database unit test case.
2015-06-17 13:11:02 -06:00
Mike Place
3401f9d154
Merge pull request #24763 from cachedout/fix_lint_24590
...
Lint riak
2015-06-17 13:04:40 -06:00
Mike Place
511e24dc5f
Lint riak
2015-06-17 13:03:35 -06:00
Mike Place
c3fcef0d8a
Merge pull request #24590 from dmyerscough/riak-features
...
Additional riak functions
2015-06-17 13:03:19 -06:00
Mike Place
e6dcf3ab12
Merge pull request #24703 from mattmb/fix/onchanges-and-or
...
Multiple onchanges requisite behaviour
2015-06-17 12:26:39 -06:00
Mike Place
9b3ec4baa7
Merge pull request #24757 from cachedout/fix_pyobjects
...
Fix loader call in pyobjects
2015-06-17 11:59:29 -06:00
Mike Place
d877f4f775
Merge pull request #23383 from cachedout/remove_overstate
...
Overstate is dead. Long live orchestrate!
2015-06-17 11:14:52 -06:00
Mike Place
dab4eccd00
Remove overstate tests
2015-06-17 11:14:19 -06:00
Mike Place
1aab1bde56
Fix loader call in pyobjects
2015-06-17 10:17:47 -06:00
Jayesh Kariya
1a4c241050
adding states/serverdensity_device unit test case.
2015-06-17 16:50:40 +05:30
Colton Myers
2ae0d7d302
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/win_file.py
2015-06-16 15:13:53 -06:00
Grischa Meyer
68fb5af970
fixing other test
2015-06-16 14:23:58 -06:00
Grischa Meyer
ba4f262b9c
fixing text for virtual support in pyobjects
2015-06-16 14:23:58 -06:00
Justin Findlay
1753234bab
Merge pull request #24615 from msteed/py3-unittests-5
...
py3 unittest compat
2015-06-16 09:25:19 -06:00
Justin Findlay
eef9317c62
Merge pull request #24668 from grischa/pyobjects_honour_virtual
...
enable virtual package names in pyobjects renderer
2015-06-16 09:05:58 -06:00
Mike Place
678ce0ce55
Merge pull request #24629 from frostyslav/develop
...
Add username/password support to artifactory module
2015-06-16 09:02:39 -06:00
mattmb
a5607d5e07
Multiple onchanges requisite behaviour
...
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
2015-06-16 15:02:11 +01:00
Jayesh Kariya
0c136fd9c2
adding states/selinux unit test case.
2015-06-16 17:11:44 +05:30
Rostyslav Fridman
18f08c5064
Fix tests for artifactory module
2015-06-16 13:02:57 +03:00
Grischa Meyer
c0c25e83b5
fixing other test
2015-06-16 11:11:04 +10:00
Grischa Meyer
2739be2059
fixing text for virtual support in pyobjects
2015-06-16 11:09:16 +10:00
Michael Steed
0a5725a67c
no-op
2015-06-15 17:08:43 -06:00
Thomas S Hatch
5ee8e50c72
Merge pull request #24339 from devopsbrett/add-consul-support
...
Use consul as an external pillar source. Requires python-consul
2015-06-15 15:16:27 -06:00
Thomas S Hatch
8997d953d9
Merge pull request #24641 from garethgreenaway/more_schedule_persistence
...
Changes to various schedule related functions to ensure persistence.
2015-06-15 10:05:08 -06:00
Jayesh Kariya
54aaaa5f12
adding states/schedule unit test case.
2015-06-15 17:16:21 +05:30
Gareth J. Greenaway
d68cd6f646
fixing unit tests related to schedule jobs in pillar.
2015-06-13 08:49:26 -07:00
Gareth J. Greenaway
56ee5b707c
updating unit tests to reflect changes.
2015-06-12 21:56:58 -07:00
Mike Place
d23a6695a4
Remove overstate tests
2015-06-12 13:00:08 -06:00
Colton Myers
5b49e89b43
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-12 11:42:42 -06:00
