Commit Graph

1567 Commits

Author SHA1 Message Date
Jorge Schrauwen
598226def1 fix unit test (attempt 1) 2015-12-02 08:34:59 -07:00
Tim Harper
e060986828 add support to s3 for aws role assumption 2015-11-28 00:57:45 -07:00
Nicolas Delaby
17ff5c1ab5 Add expose networking to modules.dockerng 2015-11-24 13:55:22 +01: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
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
e32a9aab85 rh_service._chkconfig_is_enabled unit tests 2015-11-13 23:38:40 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
2015-11-09 15:22:01 -07:00
Mike Place
7ca7ed4b37 Merge pull request #28579 from jfindlay/virt_ret
fix __virtual__ returns: tls,uptime mods
2015-11-04 15:00:02 -07:00
Justin Findlay
333c132378 fix __virtual__ returns: tls,uptime mods 2015-11-04 13:10:38 -07:00
Mike Place
ec924e8410 Merge pull request #28560 from bdrung/2015.8
Fix various typos
2015-11-04 08:06:36 -07:00
Benjamin Drung
470e82f17f Fix typo an dictionnary -> dictionary 2015-11-04 11:06:09 +01:00
Justin Findlay
11a9a5868f simplify timezone module unit test mocks 2015-11-03 19:37:54 -07:00
Justin Findlay
476b651c94 update timezone module unit tests for timedatectl 2015-11-03 19:34:01 -07:00
Colton Myers
238411c8ce Merge pull request #28464 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 13:18:21 -07:00
Colton Myers
6f6e687cb4 Mock master_uri for even tests 2015-11-02 12:15:53 -07:00
Christophe Drevet-Droguet
c63913e602 grains module: simpler comment for already set key 2015-11-02 09:31:44 -05:00
justinta89
7ca79f1f7b Skipped wipefs test if wipefs does not exist on OS 2015-10-30 15:04:33 -06:00
Erik Johnson
a44c8d8dab Merge pull request #28270 from rallytime/refactor_rabbitmq_plugin_state
Refactor RabbitMQ Plugin State to correctly use test=true and format errors
2015-10-27 11:18:34 -06:00
Erik Johnson
4efd07eba5 Merge pull request #28269 from rallytime/refactor_rabbitmq_user_state
Refactor rabbitmq_user state to use test=True correctly
2015-10-27 11:17:42 -06:00
rallytime
9e40c3a6a6 Fine tuning and fix tests 2015-10-27 10:30:00 -04:00
rallytime
65fdb50246 Get the list indice to compart before looking at keys 2015-10-26 14:20:27 -04:00
rallytime
19b8b868a3 Clean-up/fixes to rabbitmq_user state and test adjustments 2015-10-26 13:48:50 -04:00
rallytime
95defb87c5 Add test for availability_zone check to boto_vpc_tests 2015-10-26 10:15:29 -04:00
Justin Findlay
0dc72135de update blockdev exec and state module unit tests 2015-10-23 18:12:43 -06:00
justinta89
cd67843bd0 Fix schedule_test failure 2015-10-15 14:49:26 -06:00
Colton Myers
722327ee5f Merge pull request #27885 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-10-13 16:44:20 -06:00
Colton Myers
5ecd5615f2 Remove failing heavily-mocked test 2015-10-13 15:08:40 -06:00
Mike Place
36f05fb526 Merge pull request #27882 from twangboy/win_task_module
Created win_task.py module
2015-10-13 10:54:13 -06:00
Mike Place
a158cd50e6 Merge pull request #27746 from alprs/fix-timedatectl_failure
timezone module: handle timedatectl errors
2015-10-13 08:55:27 -06:00
Mike Place
9dc19caa79 Merge pull request #27816 from alprs/fix-reboot_delay
Make system.reboot use `shutdown -r` when available
2015-10-13 08:52:06 -06:00
twangboy
14e060ed9c Fixed some tests 2015-10-12 16:54:10 -06:00
Andreas Lutro
04ef51e524 make system.reboot use shutdown -r when available
see issue #27710
2015-10-12 21:54:42 +02:00
Justin Findlay
bc0f167850 update timezone mod unit tests for errors 2015-10-12 11:39:03 -06:00
C. R. Oldham
b049377cbe Remove rest_sample_test, it wasn't testing anything 2015-10-12 08:34:36 -06:00
Nicolas Delaby
821ed72f37 pass filters argument to dockerng.ps 2015-10-07 15:06:16 +02:00
Nicolas Delaby
edf625c8b4 Add support of labels parameter for dockerng 2015-10-06 13:18:05 +02:00
Colton Myers
77516912fa Merge pull request #27630 from ticosax/include-container-id-docker-mine
Expose container_id in mine.get_docker
2015-10-05 15:56:53 -06:00
Colton Myers
7a4291008e Merge pull request #27689 from rallytime/fix-tests-27448
Merge #27448 with test fixes
2015-10-05 15:17:41 -06:00
rallytime
05a506ec9f Use correct comment in test 2015-10-05 14:02:13 -06:00
rallytime
8296fefb31 Merge #27448 with test fixes 2015-10-05 12:33:03 -06:00
Nicolas Delaby
9e56a7e9db Expose container_id in mine.get_docker
Because sometimes we should be able to perform additional introspection.
2015-10-02 21:30:33 +02:00
Mike Place
fd11e0cd95 Merge pull request #27522 from twangboy/fix_26629
Removed dependency on powershell to restart salt-minion
2015-09-30 10:19:29 -06:00
Colton Myers
1f3eb1c526 Remove useless mocked unit test 2015-09-29 18:23:46 -06:00
twangboy
163c54505d Fixed tests... hopefully 2015-09-29 15:28:23 -06:00
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
2015-09-29 14:56:41 -06:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
2015-09-17 10:54:33 -06:00