valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,849 Commits 24 Branches 182 Tags 341 MiB
034a353689
Commit Graph

2931 Commits

Author SHA1 Message Date
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
twangboy
0f74afc257 Fix test_list_minion for Windows 2016-07-25 14:49:32 -07:00
rallytime
8b295fe4ea Merge branch '2015.8' into '2016.3' 
Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py
 2016-07-25 14:13:44 -06:00
Mike Place
baee2f2558 Config test no longer applies to new test config 2016-07-22 18:59:31 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
twangboy
ff1fbce6ae Add check for admin on Windows, gated 2016-07-22 15:53:17 -07:00
Mike Place
1aee8b7dd4 Merge pull request #34906 from cachedout/set_run_salt_timeout 
Set timeout for run_salt in test suite
 2016-07-22 16:43:48 -06:00
Mike Place
caf0361bc1 Merge pull request #34807 from terminalmage/issue2707 
Feature addition: preserve mode in file states
 2016-07-22 16:43:31 -06:00
Mike Place
345e3e56b8 Merge pull request #34899 from rallytime/integration-cli-tests 
Fix integration/cli/*.py test failures when Running in Python 3
 2016-07-22 16:22:11 -06:00
Mike Place
cdfd0161fc Set timeout for run_salt in test suite 2016-07-22 16:14:25 -06:00
Mike Place
ab84fd273e Merge pull request #34637 from cachedout/int_tests_interfaces 
Int tests interfaces
 2016-07-22 15:58:59 -06:00
rallytime
1031f19f3d Update batch integration tests to not be flaky in Python3 2016-07-22 14:19:15 -06:00
rallytime
109b368d19 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-22 10:32:59 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869) 
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
 2016-07-22 09:04:05 -06:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
Mike Place
d85aca1f7a Merge branch 'develop' into int_tests_interfaces 2016-07-21 12:26:21 -06:00