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
77,177 Commits 24 Branches 182 Tags 341 MiB
33a7f8b2ec
Commit Graph

3248 Commits

Author SHA1 Message Date
Mike Place
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests 
Fix test_launchctl test in mac_service
 2016-09-13 16:31:46 +09:00
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150 
Add a runner function to clear fileserver list caches
 2016-09-13 09:17:05 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests 
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
 2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
twangboy
4ae8a43435 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-09-12 12:17:30 -06:00
Mike Place
1eb67df61e Merge pull request #36198 from gtmanfred/carbon 
add keystone state integration tests
 2016-09-11 18:16:38 +09:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone 
skip some mac_timezone tests
 2016-09-10 09:07:07 +09:00
Daniel Wallace
1c31d5e464 add keystone state integration tests 
fix api_version for using connection_args
 2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945) 
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
 2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
 2016-09-09 09:36:57 -06:00
twangboy
28442b32f8 Fix some lint 2016-09-09 08:47:51 -06:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819 
Catch CommandExecutionError when the group in group_installed doesn't exist
 2016-09-09 19:14:16 +09:00
twangboy
1c83b37fe6 Fix unquoted integers 2016-09-08 17:07:28 -06:00
twangboy
345cd7f9c1 Fix test_launchctl test 2016-09-08 16:30:35 -06:00
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests 
Fix tests for mac_power module on various systems.
 2016-09-08 14:52:37 -06:00
Thomas S Hatch
736903222a Merge pull request #36122 from twangboy/mac_system_tests 
Fix test not starting, skip broken functions
 2016-09-08 14:42:48 -06:00
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159) 
* 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-08 13:03:12 -06: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
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
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
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
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
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
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
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
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
Megan Wilhite
8f7df39181 add onfail multiple test (#35968) 2016-08-31 20:40:36 -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
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
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
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
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
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
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
Justin Anderson
ab7e511fd1 Change osmajorrelease back to str (#35858) 2016-08-29 11:24:20 -06: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
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
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
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
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
21ebc61fac Use random file instead of log file for cp test 2016-08-23 19:33:45 +09:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Mike Place
187e04e109 Merge pull request #35653 from cachedout/set_computer_desc_retcode 
Switch to retcode evaluation for set_computer_desc
 2016-08-22 20:54:22 +09:00
Mike Place
6e1dcb94ec Account for differences in output 2016-08-22 20:54:03 +09:00
Mike Place
2708fbc6d2 Lint 2016-08-22 19:00:19 +09:00
Mike Place
19b77442ee Test a fix for the wheel test 
I think that what is happening here is that we're using stale grains from a previous test. This should hopefully refresh them and allow this test to succeed.
 2016-08-22 17:13:16 +09:00
Mike Place
5b75786208 Switch to using skipIf instead of a custom decorator 2016-08-22 16:36:51 +09:00
Mike Place
928a5fc3be Lint 2016-08-22 16:12:09 +09:00
Mike Place
034a353689 Use skipIf properly 2016-08-22 16:11:01 +09:00
Mike Place
844a7577db Remove disabled decorator 2016-08-22 16:04:13 +09:00
Mike Place
092aa89777 Add final args to disable event printing for wheel 2016-08-22 14:51:47 +09:00
Mike Place
2992bb8abc Fix args err in wheel test 2016-08-22 13:31:23 +09:00
Mike Place
b4f71e0260 Support the supression of prints in the wheel module 
This will clean up all those pesky key output issues in the wheel tests.
 2016-08-22 13:11:38 +09:00
Mike Place
7f137835b9 Merge pull request #35626 from cachedout/better_cleanup_for2731 
Wrap the test in a try/finally to ensure that the keys get cleaned up.
 2016-08-22 12:38:17 +09:00
Mike Place
9248ce07f9 Lint 2016-08-22 12:33:24 +09:00
Mike Place
00a419fdf7 Merge pull request #35629 from cachedout/loosen_wheel_test 
Just check for keys, not compare all keys for wheel netapi test
 2016-08-22 12:32:11 +09:00
Mike Place
b09fd9c741 Merge pull request #35632 from s0undt3ch/develop 
Fix hang on test suite termination
 2016-08-22 12:31:08 +09:00
Mike Place
7e8721b4c2 Fix wheel test to call correct wheel function 
This was not causing a test failure because no asserts were being
made but it was throwing exceptions silently. This cleans that up.
 2016-08-22 11:44:50 +09:00
Pedro Algarvio
f7693f306c
Apply child processes cleanup counter measure on testprogram too. 
Additionally, avoid timeout exceptions with registered atexit calls for testprogram(s)
 2016-08-22 00:36:53 +01:00
Pedro Algarvio
33a6e75142
Log the cmdline instead. Better nuke approach. 2016-08-22 00:36:47 +01:00
Mike Place
a85ab3e59c Just check for keys, not compare all keys for wheel netapi test 2016-08-21 22:17:27 +09:00
Mike Place
ea8fb37b48 Wrap the test in a try/finally to ensure that the keys get cleaned up. 
We're seeing the keys appear later on in some tests, such as here:

integration.modules.saltutil.SaltUtilModuleTest.test_wheel_just_function
 2016-08-21 20:22:26 +09:00
Mike Place
c4ea3cd073 Fix cache test on develop 2016-08-21 13:35:27 +09:00
Mike Place
520019f9a4 Provide a cleaner error for older versions of salt-testing for runTest() 2016-08-20 22:22:52 +09:00
Mike Place
8e784c6e80 Merge pull request #35554 from cachedout/git_test_py3 
Fix git module test for py3
 2016-08-20 22:17:13 +09:00
Mike Place
b282d877e6 Merge pull request #35482 from raazvvann/dev/rheghedu/system-comments 
Add linux support for {get,set}_computer_desc CONTINUED
 2016-08-20 11:44:25 +09:00
Mike Place
e7405258d4 Merge pull request #35499 from cro/returner_self_destruct 
Returner self destruct
 2016-08-20 11:42:03 +09:00
Mike Place
b9673b8b35 Str subst 2016-08-20 10:58:45 +09:00
Mike Place
37075ca229 Merge pull request #35557 from 10ne1/dev/ionel/fix-integration-test-tmpdir-cleanup 
tests/integration: wait for test children to terminate
 2016-08-20 10:57:22 +09:00
jmacfar
bd70a12ec6 Pass makedirs through to fileclient 
Integration tests for get_url makedirs=True
 2016-08-19 12:18:05 -05:00
rallytime
30f42d5352 Write test for multiple unless commands where 1st cmd passes and 2nd fails 
This is a regression integration test for #35384, which was fixed by #35545,
and back-ported to the 2015.8 branch in #35566.
 2016-08-18 11:04:08 -06:00
Mike Place
38630455ec Don't open files in text files in binary mode in pip test (#35553) 
Python 3 is picky about this sort of thing
 2016-08-18 09:41:19 -06:00
Heghedus Razvan
46696794ab Add integration test for {get/set}_computer_desc 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-08-18 17:03:26 +03:00
Ioan-Adrian Ratiu
0561aaf139 tests/integration: wait for test children to terminate 
This is a fix for salt github issue #35028.

Commit b02926f41c ("Immediate shutdown") removed the join() call
when stopping the daemon process, thus triggering a race between the
tmpdir cleanup logic and running children who still have data to
write. By re-adding the join() call we ensure all children finish
before the tmpdir gets removed. Children should normally be dead when
the call from join() returns, the SIGKILL logic after join() is for
cleaning up hanged processes.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
 2016-08-18 14:43:50 +03:00
Mike Place
ca045f4feb Fix git module test for py3 
Simple binary compat fixes in version compare
 2016-08-18 19:56:00 +09:00
Mike Place
9279d6b6eb Merge pull request #35496 from StackPointCloud/profitbricks-cloud-improvements 
ProfitBricks cloud provider features and improvements
 2016-08-18 09:39:02 +09:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop' 
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
 2016-08-17 12:13:26 -06:00
twangboy
1b85aa82a3 Remove unused skipIf import 2016-08-17 10:41:46 -06:00
twangboy
bd2c05b988 Fix skipped windows tests 2016-08-17 10:41:46 -06:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - tests/runtests.py
 2016-08-17 10:37:57 -06:00
Erik Johnson
235c9f5fe2 Close file descriptor for temp file 2016-08-17 10:37:46 -06:00
twangboy
4fc64e9e7a Add missing skipIf import 2016-08-17 10:37:46 -06:00
twangboy
ff96a88374 Fix/Skip tests 2016-08-17 10:37:46 -06:00
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test 
Add job cache test
 2016-08-17 19:45:28 +09:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
C. R. Oldham
f10ac3d126 Archiver is no longer a runner 2016-08-16 14:37:02 -06:00
Ethan Devenport
de42b0135c Added new features and improvements to the ProfitBricks provider including: 
* Refactored LAN and NIC provisioning to use a more efficient composite server request.
* Added support for new INTEL_XEON and AMD_OPTERON CPU family types.
* Allow additional data volumes can be created and attached to servers.
* Added public and private network firewall rules.
* Added preliminary support for loadbalancers CLI functions.
* Corrected ProfitBricks name topic index.
* Updated ProfitBricks provider documentation.
* Updated provider integration test configs.
* PEP8 clean up.
 2016-08-16 20:07:42 +00:00
rallytime
49179ac401 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
 2016-08-16 12:52:20 -06:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-08-16 11:02:05 -06:00
C. R. Oldham
32fb152ef7 Test improvement. 2016-08-16 10:33:26 -06:00
C. R. Oldham
9ff22fd4f1 WIP MySQL returner archiver 2016-08-16 10:33:26 -06:00
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
rallytime
a3a5496d0f Fix some items that went awry in the merge 2016-08-12 17:06:27 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359) 
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
 2016-08-11 10:45:24 -06:00
rallytime
a651962e95 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-10 10:02:03 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309) 
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
 2016-08-09 13:02:26 -06:00
Ch3LL
7316df7a02 fix pylint 2016-08-09 10:35:01 -06:00
Ch3LL
50a4f0fe6a fix comment 2016-08-09 09:26:51 -06:00
Mike Place
a3e29c8274 Final check for running procs (#35292) 
* Final check for running procs

This does a final check to kill any running procs that are lingering.

* Lint
 2016-08-09 08:48:06 -06:00
Mike Place
15d088c15f Avoid str to bytes join in test util (#35295) 
Fixes some shell.call tests.
 2016-08-09 08:47:34 -06:00
Mike Place
7310921f81 Merge pull request #35277 from plastikos/bug-testprogram_env_pythpath 
Joining sys.path is redundant and causes the string result to be split and re-joined.
 2016-08-09 09:10:11 +09:00
Ch3LL
6837acf742 add job cache integration tests 2016-08-08 17:01:02 -06:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
Thayne Harbaugh
5fb3f025e4 Joining sys.path is redundant and causes the string result to be split and re-joined. 2016-08-08 11:31:17 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Jeff
abb72e478f Revert b00b3c4 (but keep addition to allow_failure list in test_valid_docs()) 2016-08-06 20:10:06 +08:00
Mike Place
74f7fc0fc0 Merge pull request #35186 from terminalmage/py3-tests-integration-loader 
Make integration.loader tests PY3-compatible
 2016-08-06 17:42:41 +09:00
Erik Johnson
e2e8bbbfde Add integration test for #35214 2016-08-05 20:47:24 -05:00
rallytime
807c1729ba PY3: Use assertCountEqual instead of assertItemsEqual 
assertItemsEqual is deprecated in Python 3 and replaced by assertCountEqual
 2016-08-04 15:13:08 -06:00
rallytime
2d5d5fe7f9 Don't try to hash unicode strings in PY3 
Avoids: TypeError: Unicode-objects must be encoded before hashing
 2016-08-04 15:13:08 -06:00
Erik Johnson
9938c4ba0d Make integration.loader.loader tests PY3-compatible 
Note that the LazyLoader still doesn't work quite right, the tests still
fail. But, this resolves Python 3 incompatibility issues.
 2016-08-03 17:21:31 -05:00
Mike Place
db68d2cacb Merge pull request #35037 from twangboy/int_tests_sysmod 
Fix sysmod integration tests on Windows
 2016-08-03 07:59:00 -06:00
Mike Place
99bd7b7e3c Merge pull request #35151 from terminalmage/py3tests-integration-output 
Fix integration.output tests for PY3
 2016-08-03 07:46:16 -06:00
twangboy
8626a20942 Add missing docs and cli examples 2016-08-02 17:33:20 -06:00
twangboy
b00b3c4e65 Fix tests 2016-08-02 17:33:20 -06:00
Mike Place
59dbb05db6 Disable init script test temporarily 
This will be re-enabled later on.
 2016-08-03 07:40:30 +09:00
Mike Place
c69643d4ef Fix error in passing timeout for salt tests 2016-08-03 07:30:09 +09:00
Erik Johnson
5d40ffff01 Use a path that non-root users can write to for output file 2016-08-02 17:25:22 -05:00
rallytime
f76cf617a7 Pylint fix 2016-08-02 14:23:20 -06:00
Mike Place
2b7b4eb4ca Fix wheel test 
This aligns with the new test layout
 2016-08-03 03:53:15 +09:00
Mike Place
324fdd121f Remoe py3 fix/shell/salt.utils.event 2016-08-03 03:38:35 +09:00
Mike Place
4df8b32509 More liberal matching for batch tests 
Fixes test failures currently in develop
 2016-08-03 03:32:03 +09:00
Justin Anderson
8517ec9458 accurately check return dict 2016-08-02 10:39:21 -06:00
Justin Anderson
cc036ac907 fix test_wheel_with_kwarg 2016-08-02 10:39:21 -06:00
Dmitry Kuzmenko
b50d85a154 Properly remove minion_test_issue_2731 key. 2016-08-02 14:47:51 +03:00
Mike Place
6994825b3d Merge pull request #35015 from DSRCompany/features/8705_run_and_key_eauth 
#8705 run and key eauth
 2016-08-02 02:47:27 -06:00
Mike Place
cfc66b848e Merge pull request #35115 from cachedout/fix_state_sync 
Sync before state tests
 2016-08-02 02:46:50 -06:00
Mike Place
2743e01d9b Merge pull request #35116 from rallytime/py3-int-shell-tests 
PY3: Fix some string encoding problems in shell integration tests
 2016-08-02 02:05:30 -06:00
Mike Place
57e6ea5e51 Merge pull request #35064 from twangboy/int_tests_useradd 
Add useradd integration tests for Windows
 2016-08-02 01:59:33 -06:00
Mike Place
e058be0c3b Fix typo 2016-08-02 01:45:48 -06:00
Dmitry Kuzmenko
1d606e71c8 Fixed pylint error. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
42ef411c82 Updated salt-key test. 2016-08-02 10:01:01 +03:00
Dmitry Kuzmenko
b412e7814a Fixed salt-run integration tests. 2016-08-02 10:01:01 +03:00
Jeffrey 'jf' Lim
8ab96d9b50 Remove integration tests for sys.list_{functions,modules} 2016-08-02 12:09:56 +08:00
rallytime
d787140861 Make some adjustments after resolving merge conflict 2016-08-01 18:32:28 -06:00
Mike Place
b5e556f3a3 Sync before state tests 2016-08-01 18:26:18 -06:00
rallytime
1f45d906c8 PY3: Fix byte string encoding issues when running shell.master int tests 2016-08-01 18:03:48 -06:00
rallytime
fbe87fbb4a PY3: Fix byte string encoding issues when running shell.proxy int tests 2016-08-01 18:03:48 -06:00
rallytime
f47e2f9399 PY3: Fix byte string encoding issues when running shell.minion int tests 2016-08-01 18:03:48 -06:00
Mike Place
4587a3112f Merge pull request #35035 from plastikos/test-cli_exit_status 
Test CLI exit status
 2016-08-01 16:24:55 -06:00
twangboy
8eb97d08be Remove whitespace 2016-08-01 14:08:52 -06:00
Thayne Harbaugh
c6d08bf31b Minor tweaks to testing exit codes 
* shared config settings go in `config_base` rather than *each* config
* Ensure that `name` attribute is a string
* Ensure that `dirtree` gets used from kwargs
* Adding 'XXXX' to the mkdtemp template is unnecessary
* Only template values if they are strings - otherwise just use them directly
 2016-08-01 11:20:15 -06:00
Jeffrey 'jf' Lim
17a230a2e5 Tighten up test_list_modules_with_arg: should include "assertNotIn" too 2016-07-31 02:16:45 +08:00
twangboy
8e83757c78 Fix test_add_user_to_group 2016-07-29 12:07:14 -06:00
Thayne Harbaugh
5816463eae Corrections to proxy testing: 
* Ensure that the --config_dir argument is passed when "verbatim_args" is set
* Ensure that the user option is set to "unknown" for both proxy and minion configurations
 2016-07-29 11:57:54 -06:00
twangboy
35017d7241 Add useradd integration tests for Windows 2016-07-29 11:30:34 -06:00
Mike Place
ec821510bf Merge pull request #34909 from twangboy/int_tests_beacons 
Add check for admin on Windows, gated
 2016-07-29 10:39:28 -06:00
twangboy
2cb5787bad Remove linux gate 2016-07-29 10:24:29 -06:00
twangboy
402901aff0 Add check for admin on Windows, gated 2016-07-29 10:20:45 -06:00
Thayne Harbaugh
8a700b54f8 Appease the pylint gods: lambdas 2016-07-28 15:20:25 -06:00
Thayne Harbaugh
c37bafaca1 Appease the pylint gods. 2016-07-28 14:50:53 -06:00
Mike Place
66127f277b Merge pull request #35005 from twangboy/int_tests_state 
Fix state execution module integration tests for Windows
 2016-07-28 13:37:54 -06:00
Mike Place
9adfa4a651 Merge pull request #34972 from twangboy/int_tests_hosts 
Fix hosts integration tests for Windows
 2016-07-28 13:36:11 -06:00
rallytime
fde7e0f4c5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/schedule.py
 2016-07-28 11:08:14 -06:00
twangboy
1607da0841 Better fix 2016-07-28 09:48:09 -07:00
twangboy
5ca2f15664 Fix test_issue_1896... for Linux 2016-07-28 09:33:23 -07:00
Nicole Thomas
812916b45f Fix rabbitmq_user state test to check for correct string (#35007) 
This test was failing when I ran it locally - I'm not sure why the
error isn't showing up in Jenkins, but I double checked the string
in the state and there should be single-quotes around the user name.
 2016-07-28 08:37:37 -06:00
twangboy
d409a51bec Add missing state file for windows 2016-07-27 15:23:51 -07:00
twangboy
55cb909f68 Fix two more tests for Windows 2016-07-27 15:17:36 -07:00
Nicole Thomas
a5582d0535 Revert "Decode byte strings when running tests in Python 3" 2016-07-27 13:00:01 -06:00
twangboy
3da842cea3 Put import in the right place 2016-07-27 11:21:20 -07:00
twangboy
e74fd599ce Add missing import salt.utils.win_functions 2016-07-27 11:17:16 -07:00
rallytime
a7d4f93697 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/integration/__init__.py
 2016-07-27 11:35:16 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout 
SSH timeout
 2016-07-27 11:24:37 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976) 
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
 2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
rallytime
83d3ac4771 Decode byte strings when running tests in Python 3 2016-07-27 10:34:34 -06:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp 
Fix test_list_minion for Windows
 2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git 
Fix git integration tests for Windows
 2016-07-27 08:44:35 -06:00
Mike Place
d1e808254e Merge pull request #34968 from rallytime/fix-34967 
Older versions of psutil may not have the 'children' attribute for processes
 2016-07-27 08:37:04 -06:00
Mike Place
2d3b95dec9 Merge pull request #34971 from cachedout/increase_timeout_grains_test 
Increase timeout for grains test
 2016-07-26 16:11:29 -06:00
Mike Place
82d271b43a Increase timeout for grains test 2016-07-26 16:10:30 -06:00
twangboy
47fb8379d7 Remove hosts and aliases from sub_minion conf 2016-07-26 16:07:55 -06:00
twangboy
d7800567f5 Fix hosts integration test 2016-07-26 16:00:07 -06:00
rallytime
28d28aa82e Older versions of psutil may not have the 'children' attribute for processes 
We also should make sure the 'children' variable is instantiated before calling it.

Fixes #34967
 2016-07-26 13:46:31 -06:00
twangboy
d0a96181e6 Clarify lowercase checking 2016-07-26 10:39:54 -07:00
twangboy
3c0cf59565 Fix lint 2016-07-26 10:34:54 -07:00
rallytime
76e8dd974a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/state.py
  - tests/integration/__init__.py
  - tests/integration/wheel/key.py
 2016-07-26 11:05:24 -06:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
Shane Lee
84e2e8b101 Fix grains integration tests for Windows (#34941) 2016-07-26 10:49:10 -06:00
Shane Lee
c4131c0afb Skip inode test in Windows (#34938) 2016-07-26 08:59:47 -06:00
twangboy
a5537ad6b9 Fix test_init, add lower 2016-07-25 16:11:36 -07:00
twangboy
e50ce384c0 Fix git integration tests for Windows 2016-07-25 15:45:11 -07:00