valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,185 Commits 24 Branches 182 Tags 341 MiB
03533e9b01
Commit Graph

8392 Commits

Author SHA1 Message Date
Eric Radman
158bcbff65 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 12:39:28 +01:00
Mihai Dincă
8b480167e1 Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-09-08 12:39:28 +01:00
Eric Radman
29814f9d43 Skip utils_test if timelib is not installed (#32699) 
date_cast() throws a RuntimeError, not an ImportError
 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
d1d806f893 Fix PortageConfigTestCase in case of portage is not present 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
1c260e4bd0 Fix tests to prevent errors when libcloud is not present 2016-09-08 12:39:28 +01:00
Mike Place
f74ca15f50 Remove test for file dir behavior 
Refs #34809
 2016-09-08 11:36:17 +01:00
Eric Radman
c65aefee20 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00
twangboy
f8c0b439b8 Fixed more lint 2016-09-08 11:36:17 +01:00
twangboy
63ff731009 Fixed tests 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
04b1a4a9ca Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
46e4bb58e5 Fixed LoadAuthTestCase 2016-09-08 11:36:17 +01:00
rallytime
4e9733ad6d Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-09-08 11:36:17 +01:00
Pedro Algarvio
ec0cc943e0 Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2016-09-08 11:36:17 +01:00
kstreee
2605f34849 Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
305bab8be0 Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 11:36:17 +01:00
Eric Radman
b5ca02c867 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00
Mihai Dincă
1fb6340fef Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-09-08 11:36:17 +01:00
Eric Radman
5977f1f54c Skip utils_test if timelib is not installed (#32699) 
date_cast() throws a RuntimeError, not an ImportError
 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-08 11:36:17 +01:00
David Boucha
64a576fc6e add windows core grain test 2016-09-07 21:22:24 -06:00
Mike Place
eac9935b58 Merge pull request #36044 from Ch3LL/add_test_state_event 
add salt-run state.event test
 2016-09-08 10:23:49 +09:00
Mike Place
70da628018 Merge pull request #36070 from rallytime/fix-36057 
Use __utils__ instead of salt.utils.cloud in opennebula driver
 2016-09-08 10:18:45 +09:00
Nicole Thomas
7cdbc546f1 Back-port #36062 to 2015.8 (#36118) 
* Comment all lines in the minion config file

* Add unit tests to check for all files in conf/ to be commented out

* Make sure cont/cloud.profiles file is commented out

Matches the cloud.providers file format and other sample config files.

* Add unit tests for sample files in cloud.profiles.d, cloud.providers.d,
and cloud.maps.d

* Make sure all sample config files in cloud.maps.d are commented out

* Make sure all sample config files in cloud.profiles.d are commented out
 2016-09-07 16:01:34 -06:00
rallytime
07172cf371 Add some unit tests for the jid_queue functionality in minion.py 
Refs #35172 and #28785
 2016-09-07 14:15:35 -06:00
twangboy
da2dded3c3 Use /etc instead of /root 2016-09-07 12:34:33 -06:00
twangboy
b4112247a4 Fix test not starting, skip broken functions 2016-09-07 12:01:38 -06:00
rallytime
40d0def479 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/states/archive.py
 2016-09-07 10:11:36 -06:00
Ch3LL
ee398a94b6 fix pylint 2016-09-07 10:05:44 -06:00
rallytime
de4f77cb68 Fixup failing test: need to mock __utils__ instead of salt.utils.cloud call 2016-09-07 08:46:47 -06:00
Mike Place
6460412b1c Merge pull request #36042 from jfindlay/parallels 
add functions to parallels execution module
 2016-09-07 15:09:10 +09:00
Mike Place
ff04c162bd Skip Ruby tests on exception in pre-req check 2016-09-07 14:32:47 +09:00
Mike Place
abfe8560f8 Merge pull request #36098 from cachedout/manage_test_fix 
A more liberal search minion strings in manage test
 2016-09-07 14:26:28 +09:00
Mike Place
6216e1df8c Merge pull request #36050 from m03/add-initial-win_snmp-unit-tests 
Add initial unit tests for win_snmp
 2016-09-07 14:26:01 +09:00
Mike Place
dfcc14ad45 A more liberal search minion strings in manage test 
Correct falures where the formatting is slightly different.
 2016-09-07 12:37:29 +09:00
Mike Place
4e609a2962 Merge pull request #36062 from rallytime/fix-36045 
Add test to catch sample config files that are not commented out
 2016-09-07 10:30:30 +09:00
plastikos
dde85e1144 Various fixes for MacOS X (#36085) 
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
 2016-09-06 16:30:08 -06:00
plastikos
1101e30389 Various fixes for MacOS X (#36080) 
* Change "unknown" user to "some_unknown_user_xyz" since "unknown"
  *is* a valid user

* Add timeout to proxy test_exit_status_no_proxyid() since a known
  failure case is to infinitely loop with an error.

* Always force the source code tree under test to be the first entry
  in PYTHONPATH (excluding verbatim_env)
 2016-09-06 16:29:26 -06:00
Ch3LL
4afc82ac63 add salt-run state.event test 2016-09-06 15:16:16 -06:00
Thomas S Hatch
40081176af Merge pull request #34529 from Ch3LL/add_skip_verify_archive 
Add skip_verify for archive.extracted
 2016-09-06 15:05:31 -06:00
twangboy
9e0f45785a Fix some lint 2016-09-06 15:02:02 -06:00
twangboy
ca414e01de Fix capitalization error in setUp and tearDown 2016-09-06 15:02:02 -06:00
twangboy
af3f70d877 Seperate sleep on power button test 2016-09-06 15:02:02 -06:00
twangboy
c2b42f69c1 Move test available into their own classes 2016-09-06 15:02:02 -06:00
twangboy
efb425781f Fix lint errors 2016-09-06 15:02:02 -06:00
twangboy
35dd0619cb Check string type 2016-09-06 15:02:02 -06:00
twangboy
701031ff40 Fix sleep_on_power test 2016-09-06 15:02:02 -06:00
twangboy
5e19d4664a Check the availablity of individual tests 2016-09-06 15:02:02 -06:00
twangboy
d0d36bb874 Fix syntax error (lint) 2016-09-06 15:02:02 -06:00
twangboy
9be71e5a5d Check for Desktop, fix some functions 2016-09-06 15:02:02 -06:00
Nicole Thomas
e7e1330d02 Merge pull request #36075 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-06 13:46:33 -06:00
Mike Place
e79c42e515 Fix signal handling (#36067) 
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
 2016-09-06 11:30:21 -06:00
rallytime
cf7a590a71 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-06 11:14:22 -06:00
rallytime
da25415e2c Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
  - salt/modules/gentoo_service.py
  - salt/utils/event.py
  - salt/wheel/key.py
 2016-09-06 11:11:34 -06:00
Moe
3c264528fb Expand/improve win_iis_test tests (#36053) 
* Expand win_iis_test tests

* Fix linting issue
 2016-09-06 10:47:28 -06:00
mwinnett
d6d38aad9e Update versionadd tags 2016-09-06 09:22:55 -07:00
Pablo Suárez Hernández
71ebf2c8cd Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
rallytime
dd53a26af5 Add unit tests for sample files in cloud.profiles.d, cloud.providers.d, 
and cloud.maps.d
 2016-09-05 19:11:19 -06:00
rallytime
b04cc62927 Add unit tests to check for all files in conf/ to be commented out 2016-09-05 18:08:02 -06:00
mwinnett
64b3649ab6 Add unit tests for win_snmp state 2016-09-05 00:30:35 -07:00
Erik Johnson
9ae753f6ed Use self.run_run instead of self.run_run_plus 
Using a salt.runner.Runner() instance to run this test has exposed a
problem with run_run_plus, where the fileclient doesn't behave as
expected. Since the raw return data is not needed, using run_run here
lets the test pass while we continue to work on run_run_plus.
 2016-09-03 14:59:04 -05:00
Erik Johnson
ab9a89d6dc Add test for jid in runner ret events (zh 858) 2016-09-03 14:59:04 -05:00
Erik Johnson
3345da0d36 Add tests for gitfs per-saltenv configuration (#29954) 2016-09-03 14:59:04 -05:00
Erik Johnson
c35ed45668 Rename test file so that it runs properly when unit tests are executed 2016-09-03 14:59:04 -05:00
Erik Johnson
92d6d4ab75 Fix incorrect key for return data 
The return data from run_run_plus previously returned the runner return
in the ``fun`` key. This has since been corrected. This commit replaces
these references to the ``fun`` key with the corrected ``return`` key.
 2016-09-03 14:59:04 -05:00
Erik Johnson
5673395f0c Update usage of run_run_plus to remove unused "options" argument 2016-09-03 14:59:04 -05:00
Erik Johnson
d4059a0d79 Update the run_run_plus docstring 2016-09-03 14:59:04 -05:00
Erik Johnson
74d5f3aa51 Remove unused argument 2016-09-03 14:59:04 -05:00
Erik Johnson
a4e96cfb7a Don't execute the runner twice in run_run_plus 
Instead, compile output by executing salt.output.display_output() on the
return data obtained from executing the runner via the Python API.
 2016-09-03 14:59:04 -05:00
Erik Johnson
f41db032a2 Add ability to reload client_config to run_run_plus 
This allows one to pass a kwarg to run_run_plus called
``__reload_config`` which will be passed as the ``from_scratch``
argument to self.get_config(). This allows self.run_run_plus() to force
a reload of the master config for integration tests which require the
config to be reloaded, for instance, from master.d/*.conf.
 2016-09-03 14:59:04 -05:00
Erik Johnson
230c684d4c Add test case for runner returns 2016-09-03 14:59:04 -05:00
Erik Johnson
070e5f3c48 Fix typo, add return and jid to run_run_plus 
Also make kwargs work (they were being ignored)
 2016-09-03 14:59:03 -05:00
mwinnett
2b92c383f1 Add initial unit tests for win_snmp 2016-09-03 12:34:28 -07:00
Justin Findlay
430ec201d9 modules.parallels: add exists and state fcns 2016-09-02 15:48:03 -06:00
Justin Findlay
0f7d704eb6 modules.parallels: add clone and delete functions 2016-09-02 15:48:03 -06:00
Justin Findlay
9eb0f637e9 modules.parallels.list_vms: add template arg, update name arg 2016-09-02 15:40:56 -06:00
Justin Findlay
d913f2cbe7 modules.parallels: add prlsrvctl function 2016-09-02 15:40:56 -06:00
Daniel Wallace
65b6734c04 catch unicode encoding errors in json outputter (#36033) 
Add testing too
 2016-09-02 14:56:09 -06:00
Nicole Thomas
03ebb59e5e Remove commented out skipIf lines in boto_vpc_test module (#36013) 
If we're running these tests successfully now, then let's remove these lines.
 2016-09-02 14:37:41 -06:00
rallytime
1bf840b036 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-09-02 09:43:40 -06:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/service.py
 2016-09-02 08:19:16 -06:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
rallytime
f8c9b8443f Pass in connection parameters to boto_vpc function calls 
Otherwise we are not properly mocking this function call and the
tests fail when the `_conn3` function is called. (Any distro using
salt.utils.boto3 will fail here.)

We also need to protect the test class if the correct versions of
boto and moto are not installed on the test system.
 2016-09-01 22:35:14 -06:00
Justin Anderson
9f7994ea40 Suse user state test fix (#36009) 2016-09-01 16:28:13 -06:00
Justin Anderson
e6b4dd651e Suse Useradd test fix (#36007) 2016-09-01 15:57:03 -06:00
Justin Anderson
40131b9c27 Groupadd test fix (#36002) 
* Change osmajorrelease back to str in test_useradd

* Change osmajorrelease back to str in test_userdel

* Change osmajorrelease back to str in test_members
 2016-09-01 15:40:15 -06:00
Aditya Kulkarni
50981f4f11 Add unit tests for VPC module (#35996) 2016-09-01 15:12:22 -06:00
Heghedus Razvan
1a38cc340c shadow: test set&delete password for root (#35929) 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-09-01 11:25:44 -06:00
Mike Place
beec674141 Skip one Snapper test on 2.6 
There's a slight difference in the diff comparison but we should be
able to catch true failures here with 2.7.
 2016-09-01 20:19:06 +09:00
Megan Wilhite
8f7df39181 add onfail multiple test (#35968) 2016-08-31 20:40:36 -06:00
Aditya Kulkarni
347b05abd0 Add test for cassandra_cql returner's ssl opts parsing (#35944) 2016-08-31 15:26:11 -06:00
Nicole Thomas
5d5fdf973b Pylint fix for #35930 (#35950) 2016-08-31 13:26:14 -06:00
Heghedus Razvan
bf6e1fa097 Add integration test for groupadd module (#35930) 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-08-31 13:21:07 -06:00
Pedro Algarvio
f842ddd525 OSX testsuite fixes (#35948) 
* OSX is a bit more restrictive on getting the process information

* OSX says the sockets aren't connected, which is weird, but...

* Close the sockets on OSX
 2016-08-31 13:09:51 -06:00
Daniel Wallace
9bdb161eac Add Keystone v3 support (#35911) 
* Openstack keystone V3 API support in keystone modules.

* Python3 compatibility unicode to six.text_type

* Return values of tests: test_user_absent, test_endpoint_absent,
test_role_absent, test_service_absent, test_tenant_absent

* Fixed tests states.test_role_present and states.service_present

* Fixed module tests (not all)

* These are the old tests and need to be rewritten anyway

* fix pylint error

* fix keystone state tests
 2016-08-31 11:55:23 -06:00
rallytime
d7380d83be requires_system_grains decorator needs a grains=None kwarg 2016-08-31 11:35:02 -06:00
Mike Place
6bcd76bfce Catch shutdown error in test suite (#35933) 
Change made per @s0undt3ch
 2016-08-31 09:35:20 -06:00
Mike Place
24920aa226 Shut down time sync before setting time in tests (#35900) 
* Shut down time sync before setting time in tests

* Lint

* Revert "Lint"

This reverts commit 6e3e6b76908b2c79647c7840fc3981548b2d13fc.

* Lint fix (ugh)
 2016-08-31 09:16:39 -06:00
Mike Place
a238666aba Add serializer test 2016-08-31 23:16:40 +09:00
Mike Place
e84cee89b8 Merge pull request #35937 from cachedout/increase_ssh_timeout_again 
Increase SSH test timeout to 90s from 25s
 2016-08-31 21:47:50 +09:00
Mike Place
becaa7d01f Fix colored output 2016-08-31 21:41:05 +09:00
Mike Place
0b38c75a28 Increase SSH test timeout to 90s from 25s 2016-08-31 21:34:38 +09:00
Mike Place
ed2ef93107 Enable debug logs for ssh tests 
This might be only temporary but we need to see why some tests are flakey.
 2016-08-31 20:42:27 +09:00
Mike Place
c30abb489a Merge pull request #35927 from saltstack/revert-33010-state_grains_present_assert_only 
Revert "For #31309. If value not supplied only check for existence"
 2016-08-31 18:35:32 +09:00
Mike Place
6559cf347b Revert "For #31309. If value not supplied only check for existence" 2016-08-31 18:06:49 +09:00
Nicolas Delaby
8c7233ad4d Revert "Fixup Docker test" 
This reverts commit 3bd8a7027b.
 2016-08-31 09:48:57 +02:00
Thomas S Hatch
407d164752 Add tests for #22558 (#35915) 2016-08-30 17:13:12 -06:00
Ch3LL
38203e3d2c add tornado web app to serve up static file for test 2016-08-30 15:43:28 -06:00
rallytime
b20f6b9384 Catch CommandExecutionError when group_installed doesn't exist 
Includes an integration test to make sure this doesn't regress.

Fixes #35819
 2016-08-30 11:44:17 -06:00
Mike Place
f7d8f408c2 Merge pull request #35822 from terminalmage/issue35045 
Fixes for top file merging
 2016-08-31 01:40:41 +09:00
Erik Johnson
9ee1b967f1 Rewrite top file merging tests 2016-08-30 08:58:18 -05:00
Erik Johnson
48a99bc939 Add missing import after moving highstate tests 2016-08-30 08:58:18 -05:00
Erik Johnson
fde7d68b89 HighState -> salt.state.HighState 2016-08-30 08:58:17 -05:00
Erik Johnson
f1613d733d Move highstateconf_test tests into state_test.py 
This keeps the tests organized and following the same naming convention
established elsewhere.
 2016-08-30 08:58:17 -05:00
Mike Place
f3334126b4 Lint IIS test 2016-08-30 22:50:36 +09:00
Mike Place
3bd8a7027b Fixup Docker test 
This test just looks to see if changes were made.
 2016-08-30 20:49:02 +09:00
Mike Place
65a56a6f51 Merge pull request #33010 from Tanoti/state_grains_present_assert_only 
For #31309. If value not supplied only check for existence
 2016-08-30 17:57:57 +09:00
Mike Place
6725cd458c Merge pull request #35156 from twangboy/int_states_file 
Fix integration tests for file state on Windows
 2016-08-30 17:45:17 +09:00
Mike Place
353d4b70eb Merge pull request #35180 from twangboy/int_states_cmd 
Fix integration tests for cmd state on Windows
 2016-08-30 17:44:04 +09:00
Mike Place
cbf927ea7a Merge pull request #35703 from s0undt3ch/develop 
Signal handling improvements
 2016-08-30 17:37:01 +09:00
Mike Place
83cd956b7b Merge pull request #35845 from m03/dry-and-more-iis-unit-tests 
Additional win_iis unit tests and DRY
 2016-08-30 16:20:51 +09:00
Justin Anderson
e744b795d1 Make ddns_test happy with py3 and py26 (#35857) 
* Make python3 and python26 happy

* Don't need both ways of nesting with statements

* No longer need pylint disable

* Lint fix

* take out the correct import
 2016-08-29 16:33:54 -06:00
twangboy
f1bb655e82 Use returns instead of elses 2016-08-29 16:25:29 -06:00
twangboy
f5e0398cc0 Remove skipIf decorator 2016-08-29 16:13:41 -06:00
Justin Anderson
3f7e4d9f59 traversal_spec has skip=True, not false (#35877) 2016-08-29 16:12:16 -06:00
twangboy
1f7c4e2a32 Fix other mode tests for Windows 2016-08-29 16:12:06 -06:00
twangboy
ecd58bab06 Fix key error 2016-08-29 16:03:00 -06:00
twangboy
9be5d83a25 fix managed_file_mode test 2016-08-29 15:59:17 -06:00
twangboy
566d9b4982 Close file properly 2016-08-29 15:29:47 -06:00
twangboy
b7263d24b5 Additional cachedout recommendations 2016-08-29 15:22:17 -06:00
Erik Johnson
16453e35f0 Fix legacy git_pillar tests (#35713) 
* Add debug logging to legacy git_pillar tests

This is to aid in troubleshooting some failures on the branch builds

* Reverse monkey-patching after test completes

* Fix misspelling in git_pillar unit tests

* Ensure 2nd repo is updated

* Add logging for legacy git_pillar checkout func

* Explicitly set hash_type in opts for git_pillar tests

* Do not use dict.get() to get hash_type

This code is a relic from before we set a default value for this in
salt.config. There is no expectation that this value will be unset, so
there is no need to use dict.get() here.
 2016-08-29 14:58:31 -06:00
twangboy
97f3c1fa71 Add missing import 2016-08-29 14:53:41 -06:00
twangboy
9dfa523cc0 Fix test_symlink for Windows 2016-08-29 14:53:41 -06:00
twangboy
aca27acc9b Fix test_template_local_file and _noclobber 2016-08-29 14:53:41 -06:00
twangboy
31c983fac5 Fix test_template_local_file_noclobber for Windows 2016-08-29 14:53:41 -06:00
twangboy
a37f250460 Fix a few more tests for Windows 2016-08-29 14:53:41 -06:00
twangboy
85fc2f1adc Fix test_absent_link, test_managed_contents 2016-08-29 14:53:41 -06:00
twangboy
aafe1aff38 Create missing source for symlink on windows 2016-08-29 14:53:41 -06:00
twangboy
c9acbfee38 Fix jinja 2016-08-29 14:53:41 -06:00
twangboy
cd2ce9fb01 Use Jinja instead of seperate files 2016-08-29 14:53:41 -06:00
twangboy
ba2047e37b Fix a few more tests 2016-08-29 14:53:41 -06:00
twangboy
64ca61065d Use IS_WINDOWS instead of salt.utils.is_windows 2016-08-29 14:53:41 -06:00
twangboy
b647630dd3 Add missing @ on decorators 2016-08-29 14:53:41 -06:00
twangboy
56180cf09d Fix/Skip tests for windows 2016-08-29 14:53:41 -06:00
twangboy
4d4ffac5ae Gate stuff that makes windows crash 2016-08-29 14:53:41 -06:00
Nicole Thomas
27697e952a Pylint fixes for develop branch (#35863) 2016-08-29 12:20:50 -06:00
Justin Anderson
ab7e511fd1 Change osmajorrelease back to str (#35858) 2016-08-29 11:24:20 -06:00
Mike Place
9aea24aa47 Fixed a bug in windows hostname settings when the hostname is longer than 15 chars (#35848) 
- The previous implementation was limited to the 15 char limit for "Computernames" which would cause the state to always fail if the hostname was longer
 2016-08-29 10:09:53 -06:00
mwinnett
f48ebd082f DRY, additional win_iis unit tests 2016-08-28 23:42:53 -07:00
Mike Place
409f17aa58 Merge pull request #35673 from cro/proxy_getsi_fix 
Proxies don't handle reusing the SmartConnect instances very well.  D…
 2016-08-29 13:11:35 +09:00
Mike Place
5bb62345f6 Merge pull request #35728 from alexbleotu/vmware_enhancements-gh 
Vmware enhancements gh
 2016-08-29 12:54:14 +09:00
Mike Place
51b304f4a8 Merge pull request #35757 from vutny/grains-filterby-wildcard 
grains.filter_by: lookup_dict key could be a globing pattern
 2016-08-29 12:23:05 +09:00
Mike Place
202d9adf2e Merge pull request #35778 from kraney/boto_cloudwatch_event 
Boto cloudwatch event
 2016-08-29 11:20:47 +09:00
Mike Place
f6b31be592 Lint 2016-08-29 10:18:52 +09:00
Tarjei Husøy
8d2d20903d Ensure ssh keys are decodable before inserting 
Closes #35631.
 2016-08-28 11:45:41 -07:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
David Boucha
822b0a0f33 Don't test for linux shells on Windows (#35743) 
* Don't test for linux shells on Windows

* Don't force windows to be false

Salt didn't used to support runas on Windows.
Salt now supports runas on Windows. This line was causing the wrong code
paths to be followed.

* Skip test on windows because no VT on windows

* add missing closing paren
 2016-08-26 12:52:39 -06:00
Hengyang Hu
b89f45598e fix 34241, webutil.useradd_all is deprecated (#35788) 
* fix 34241, webutil.useradd_all is deprecated

* in src webutil.useradd_all get replaced by webutil.useradd, change the mocks accordingly
 2016-08-26 12:52:11 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802) 
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
 2016-08-26 10:44:22 -06:00
Kris Raney
9b3e48bd6e Fix pylint warnings in test code 2016-08-25 15:51:02 -05:00
Kris Raney
170e8238c8 Add cloud watch events unit tests 2016-08-25 13:30:56 -05:00
rallytime
381debe53b Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
 2016-08-25 10:14:38 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test 
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
 2016-08-25 09:55:23 -06:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
Alexandru Bleotu
e993f99053 Improved salt.utils.vmware.get_content, get_mors_with_properties 
- added optional traversal_spec parameter to both methods, allowing the
  user to specify a different TraversalSpec object to search for content
  (if not specified, the behaviour is that all a traverse all search is
  done)
- the traversal_spec is destroyed only if is created in the method
- added local_properties flag to both methods allowing the retrieval of
  properties of the container object
- added tests for the 2 functions
 2016-08-25 10:42:48 +01:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720 
Refs #35720
 2016-08-24 17:48:45 -06:00
rallytime
61e37d5956 Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/loader.py
  - salt/modules/s3.py
  - salt/utils/s3.py
  - tests/unit/modules/s3_test.py
 2016-08-24 09:58:56 -06:00
Denys Havrysh
38d587c5fe grains.filter_by: lookup_dict key could be a globing pattern 2016-08-24 17:52:14 +03:00
Mike Place
248776d704 Merge pull request #35655 from raazvvann/dev/rheghedu/shadow 
shadow module: fix return values && integration test
 2016-08-24 17:12:02 +09:00
Mike Place
44efc3a162 Merge pull request #35704 from twangboy/win_whitelist 
Add whitelist for windows tests
 2016-08-24 16:42:05 +09:00
C. R. Oldham
ae9b2726b5 Fix some spelling, add better test for proxy 2016-08-23 16:42:14 -06:00
Justin Anderson
154dafdb89 Fix snapper_test for python26 2016-08-23 15:02:31 -06:00
Justin Anderson
63955392e4 os_family is Suse not SUSE (#35706) 2016-08-23 14:55:16 -06:00
Nicole Thomas
28f3ed47ca Don't assume we have a file to remove in tearDown (#35709) 
Some tests build the state file in the test itself and need to
be removed. However, some tests rely on sls files inside of the
integration file state tree. Therefore, in those tests, we have
nothing to remove.
 2016-08-23 14:43:55 -06:00
Nicole Thomas
f3f068be72 Merge pull request #35702 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-23 13:40:50 -06:00
twangboy
4951deed3e Add whitelist for windows tests 2016-08-23 11:22:24 -07:00
Pedro Algarvio
092e863842
Account for a not recent enough salt-testing library 2016-08-23 19:04:49 +01:00
Pedro Algarvio
85fe1b31d5
Use the terminate_process_pid helper function 2016-08-23 18:36:27 +01:00
Pedro Algarvio
9cdda5377a
Use the terminate_process_pid helper function 2016-08-23 18:36:27 +01:00
Daniel Wallace
2d2bc1ffea use aws.get_location in s3 modules 
Also load the __utils__ into pillar and fileserver and fileclient so
that this function can be used there with __opts__.

Also sets the default for s3 to 'us-east-1' like it is documented.

Closes #30976
Closes #28913
 2016-08-23 12:12:15 -05:00
Mihai Dincă
c80407ec4b Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-08-23 10:49:53 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
Alexandru Bleotu
e66841ef69 Improved salt.utils.vmware.wait_for_task 
- improved logging/description
- on success the method returns the result and on error it raises the
  exception it got from vmware
- added unit tests
 2016-08-23 17:07:54 +01:00
C. R. Oldham
424a9a8137 Merge pull request #34059 from alexbleotu/vmware_common-gh 
Vmware common gh
 2016-08-23 09:24:15 -06:00
Mike Place
618254a3f3 Merge pull request #35692 from cachedout/fix_status_test 
Include grains in status moduele for unit test
 2016-08-23 23:38:32 +09:00
Alexandru Bleotu
77e6e5afee Improved connection to a VMware vCenter Server or ESXi host 
- added support for passthrough connections via SSPI
- added function to specify if a connection is made to a vCenter or ESXi host
- added function to disconnect from a vCenter or ESXi host
- added tests for changed/new functions
 2016-08-23 13:46:28 +01:00
Heghedus Razvan
21c66afea4 Add integration test for shadow module 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-08-23 15:34:56 +03:00
Mike Place
08cc903be0 Include grains in status moduele for unit test 2016-08-23 21:09:41 +09:00
Mike Place
9865b07729 Adjust mock for docker test 
cc: @dmacvicar
 2016-08-23 21:04:52 +09:00
Mike Place
21ebc61fac Use random file instead of log file for cp test 2016-08-23 19:33:45 +09:00
Mike Place
b90969089f Merge pull request #35379 from vutny/issue-15061 
grains.filter_by: allow grain value to be a list
 2016-08-23 17:21:40 +09:00
Mike Place
9602a977c3 Merge pull request #35676 from rallytime/fixup-unit-tests 
Fixup unit tests errors that are not registering as failures
 2016-08-23 16:19:17 +09:00
rallytime
b5e5eeecd0 Remove htpasswd unit test for deprecated function that doesn't test anything 2016-08-22 17:14:07 -06:00
rallytime
49798ee301 Remove every.weeks reference: not available in relativedelta 2016-08-22 16:07:36 -06:00
rallytime
e14c930a74 Fixup errors in pillar consul unittests 2016-08-22 15:35:12 -06:00
Nicole Thomas
9fe0972761 Merge pull request #35662 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-22 13:03:43 -06:00
Justin Anderson
64974c89d9 Backport #35627 to 2016.3 (#35661) 
* This test was doing all sorts of things, raging from simply failing
to driving CPUs to 100%, to leaking memory until the entire test suite crashes.

This seems to happen only in conjunction with running the entire unit test suite
and does not occur on its own

cc: @kraney

* Better method to skip test. This way we can track it.
 2016-08-22 13:03:24 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Nicole Thomas
92ecbc3b26 Remove deprecated version of status.uptime module function (#35535) 
* Remove the deprecated version of the status.uptime function.

The deprecated version of the function was set to be removed in
Carbon. The Carbon release notes were also updated with this change.

* Remove test_deprecated_uptime unit test

The deprecated version of uptime no longer exists.

* Remove unused import and deprecated uptime reference
 2016-08-22 09:25:21 -06:00
Mike Place
a66912f96e Merge pull request #35657 from cachedout/check_attr_in_test_utils 
Check for attr before attempting to add in salt.tests.utils
 2016-08-22 23:50:06 +09:00