Commit Graph

3832 Commits

Author SHA1 Message Date
rallytime
e195376f61 Patch isdir call and test seach path tuple positions as well 2016-04-01 15:09:57 -06:00
rallytime
b86f6922c4 Print search_paths return for debugging 2016-04-01 13:52:43 -06:00
rallytime
bf48922e7d Add test for 'deploy_scripts_search_path' contents in salt.config.cloud_config 2016-04-01 09:43:30 -06:00
rallytime
ea3d21d126 Fix failing test 2016-03-30 16:53:42 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
Mike Place
4a5d1b1dd3 Merge pull request #31768 from twangboy/mac_xattr_int
Integration Tests for mac_xattr.py
2016-03-30 13:03:25 -06:00
twangboy
66afd4855c Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
93f252d868 Fix some pylint errors 2016-03-30 08:56:49 -06:00
twangboy
f5f7249c37 Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
3c1c076d78 Fix unit tests 2016-03-30 08:46:02 -06:00
Mike Place
4ad92da5c4 Merge pull request #32214 from jtand/fix_test_kill
Undo previous fix for a more correct fix for process_test.test_kill
2016-03-29 13:15:20 -06:00
Justin Anderson
b25e995efd Lint fix 2016-03-29 10:57:46 -06:00
Justin Anderson
5a57f2e1c6 Undo previous fix for a more correct fix for process_test.test_kill 2016-03-29 09:58:28 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
Nicole Thomas
f513e401d8 Merge pull request #32188 from jtand/fix_test_kill
Fix test kill
2016-03-28 16:38:48 -06:00
Justin Anderson
0f4f303380 Lint fix 2016-03-28 12:37:52 -06:00
Justin Anderson
a74bb9b67f Fix the process_test.test_kill failure in 2016.3 2016-03-28 11:33:55 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
rallytime
58c844a7d7 Add mac_desktop integration tests
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
2016-03-24 17:02:53 -06:00
rallytime
6886681410 Fix test failures 2016-03-24 16:45:03 -06:00
Mike Place
1545b80017 Merge pull request #32034 from twangboy/mac_pkgutil_int
Integration tests for mac_pkgutil
2016-03-24 15:44:51 -06:00
Justin Anderson
d172b1d270 Fix the process_test.test_kill failure in 2016.3 2016-03-24 14:31:43 -06:00
Justin Anderson
f8080b8e59 Re-enable some skipped Boto tests 2016-03-24 10:30:48 -06:00
rallytime
fa09de7a58 Merge branch '2015.8' into '2016.3'
Conflicts:
  - tests/unit/states/rabbitmq_user_test.py
2016-03-23 10:56:25 -06:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests
Mac assistive tests
2016-03-23 09:51:36 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl
Bring back localectl parsing in locale module for when dbus module is unavailable
2016-03-23 09:47:27 -06:00
Justin Anderson
df9abd5021 Skipped test if zeromq is not transport 2016-03-22 16:01:18 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
rallytime
b1bdb688ae Add unit tests for new remove function, too. 2016-03-22 14:25:49 -06:00
rallytime
88ba210f86 Add mac_assistive integration tests
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
2016-03-22 14:11:40 -06:00
twangboy
158ebc76b8 Fix unit tests for mac_utils 2016-03-22 13:46:19 -06:00
Colton Myers
95c08f55e9 Tear out useless unit test 2016-03-22 13:46:06 -06:00
twangboy
7daf9d8277 Remove unit tests without logic 2016-03-21 17:47:34 -06:00
twangboy
5658753a5f Add already installed check 2016-03-21 17:33:25 -06:00
twangboy
933e275b3a Add integration tests 2016-03-21 15:03:31 -06:00
Andreas Lutro
a31cdf1968 Fix and improve locale module for systemd
- parse localectl output when dbus module is unavailable
- use dbus/localectl whenever the system is detected to have been booted
  with systemd as the init system, regardless of os grain
- simplify and improve logic when parsing dbus/localectl
  - don't rely on exceptions to find the end of the locale params
  - make sure that all locale params get returned
2016-03-21 20:22:16 +01:00
twangboy
100bcefa60 Fix unit tests 2016-03-21 12:15:08 -06:00
Nicolas Delaby
e511864a55 Fix ports exposition when protocol is passed.
fixes #32013
2016-03-21 10:44:22 +01:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Nicole Thomas
03e8b72655 Merge pull request #31904 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-03-16 11:23:54 -06:00
Mike Place
b068eaa963 Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix
Fix the always-false behavior on checking state
2016-03-15 17:02:19 -06:00
rallytime
892591a39c More pylint fixes 2016-03-15 15:50:05 -06:00
Mike Place
c28fc6e1d8 Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable
Hotfix/windows proxy enable
2016-03-15 12:58:33 -06:00