Commit Graph

319 Commits

Author SHA1 Message Date
Pedro Algarvio
2eafc5c411
"Tell" coverage to track subprocesses. 2019-01-25 13:00:03 +00:00
Gareth J. Greenaway
f44a87ee66
One last lint fix. 2018-12-20 16:40:32 -08:00
Gareth J. Greenaway
45f363b152
Fixing various lint errors. 2018-12-20 16:19:01 -08:00
Daniel A. Wozniak
16d10fbad7
Fix linter warnings 2018-12-19 10:03:18 -07:00
Daniel A. Wozniak
b22f827e79
Increase and standardize ShellCase timeouts 2018-12-19 10:02:57 -07:00
Gareth J. Greenaway
fde8db5ef4
Merge branch '2017.7' into merge-2017.7
Conflicts:
	tests/support/case.py
2018-12-04 15:53:04 +01:00
Daniel A. Wozniak
ecd84863cd
Honor run_run timeout for shell tests 2018-12-02 15:21:17 -07:00
Mathieu Parent
12ea1cc01e
git_pillar: Add tests for mountpoint parameter
(cherry picked from commit 6e2f4e471d08fcc29ce144af6dcd605b85644522)
2018-11-16 06:07:24 +01:00
Mathieu Parent
fce467e438
git_pillar: Add tests for root parameter
(cherry picked from commit 2e88b74816)
2018-11-16 06:07:24 +01:00
Mathieu Parent
ba150a5182
Don't fail on git_pillar tests when destructive tests are not enable
This fixes the following when running `python tests/runtests.py --ext-pillar`:

 --------  Tests with Errors  ------------------------------------------------------------------------------------------------------------------------
   -> tearDownClass (integration.pillar.test_git_pillar.TestGitPythonSSH)  ...........................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
   -> tearDownClass (integration.pillar.test_git_pillar.TestPygit2SSH)  ..............................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
 -----------------------------------------------------------------------------------------------------------------------------------------------------

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
(cherry picked from commit 84e9fce9bb)
2018-11-16 06:07:22 +01:00
Erik Johnson
fbee11dadc
Enable proxy/ssh daemons when filename mapping causes those tests to be run
The proxy and ssh tests won't run when the `--proxy` and `--ssh` CLI
flags, respectively, aren't passed to runtests.py. This ensures that we
start the daemons when the file mapping logic triggers them to be run.
2018-11-15 16:26:05 -06:00
rallytime
d8e7c47a05
Merge branch '2017.7' into '2018.3'
Conflicts:
  - tests/support/case.py
2018-11-12 16:11:17 -05:00
Daniel A. Wozniak
57f702dc58
Fix linter warning 2018-11-11 21:49:20 -07:00
Daniel A. Wozniak
686153a77c
Fix up integration.minion.test_timeout
This test wasn't able to be run on it's own. Fix it and add more
debugging
2018-11-11 21:30:08 -07:00
Pablo Suárez Hernández
b7af5e52c5
Test git ext_pillar across multiple repos using __env__ 2018-11-07 16:33:03 +00:00
Nicole Thomas
f7c2f04574
Merge pull request #50182 from terminalmage/issue50050
Backport runtests.py modifications from develop to 2018.3
2018-10-29 12:25:06 -04:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3'
No conflicts.
2018-10-24 15:54:15 -04:00
Daniel A. Wozniak
7f613ac020
Do not fail if process already ended
We can expect the subprocess has already ended by the time we're
checking for child processes. Handle this case gracefully so that tests
do not fail with an exception.
2018-10-24 10:17:59 -07:00
Erik Johnson
85612cfc8f
runtests.py: Fix IndexError in --from-filenames 2018-10-23 14:53:20 -05:00
Daniel A. Wozniak
25097f9933
Make sure from-filenames intersect with names-file
When both names-file an from-names are defined we want to make sure the
tests that from-filenames returns intersect with the test in the names
file.
2018-10-23 14:53:01 -05:00
Erik Johnson
ed864ceb28
runtests.py: Accept modified file list from a text file 2018-10-23 14:52:39 -05:00
Erik Johnson
b1ee2e524b
Set a default value for the filename map path 2018-10-23 14:51:39 -05:00
Erik Johnson
75e6731027
Use the new helper to get the test mods 2018-10-23 14:22:07 -05:00
Erik Johnson
c3dc8ec1d0
Add function to get all of the test modules 2018-10-23 14:22:07 -05:00
Erik Johnson
6433c48d8c
Don't import old module name
We'll handle the old name when backporting
2018-10-23 14:21:21 -05:00
Erik Johnson
a97e0320bf
Move helper outside of for loop 2018-10-23 14:21:21 -05:00
Erik Johnson
07d6f2aca0
Enhancements to --from-filenames, --filename-map options
This commit adds the following features:

- Changes to test modules are identified, and those tests are added to
  the list of tests to be run
- expr_match is used to allow the filename map to use either globbing or
  regular expressions
- Corresponding state tests are added when doing filename matches,
  meaning that for example the git state tests will be run when the git
  execution module is in the --from-filenames list
2018-10-23 14:21:21 -05:00
Erik Johnson
44199b1d33
Add --from-filenames and --filename-map options to parser
This allows for the passed filename(s) to decide which tests are run
2018-10-23 14:21:21 -05:00
Daniel A. Wozniak
df5e27156e
Add spm tests for windows 2018-10-04 15:43:50 -07:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/state.py
  - salt/utils/hashutils.py
  - tests/integration/modules/test_state.py
2018-10-02 15:09:51 -04:00
Daniel A. Wozniak
7ce1b645c0
Use utf-8 encoding for salt-runtests.log 2018-09-28 13:08:37 -07:00
Daniel A. Wozniak
536fce611f
Increase function timeout 2018-09-20 09:30:17 -06:00
Daniel A. Wozniak
1f60753a47
Do not use close_fds on Windows OS 2018-09-19 19:07:41 -06:00
Daniel A. Wozniak
1757eddae1
Increase ModuleTest.run_function timeout
Reduce flakyness with greater timeout
2018-09-19 11:21:12 -06:00
Daniel A. Wozniak
10ec8beb39
Fix linter issues 2018-09-10 10:00:25 -07:00
Daniel A Wozniak
ccbcb5588a
Add more tests to whitelist for Windows 2018-09-10 09:34:27 -07:00
rallytime
ab6cc1c741
Update old utils paths to use new paths 2018-08-28 11:41:38 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/ext/win_inet_pton.py
  - salt/pillar/git_pillar.py
  - tests/integration/cli/test_batch.py
  - tests/integration/modules/test_archive.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/states/test_file.py
  - tests/support/case.py
  - tests/whitelist.txt
2018-08-28 11:22:47 -04:00
Daniel Wozniak
d50324b4b5
Merge branch '2017.7' into more_tests 2018-08-27 16:30:10 -07:00
Daniel A Wozniak
cd6706e9f0
Fix merge wart 2018-08-27 14:36:40 -07:00
Daniel A Wozniak
3e55d10584
Platform module doesn't exist in 2017.7 2018-08-27 00:44:36 -07:00
Daniel A. Wozniak
0394ece642
The set command does not work like inline env vars
Remove set command prefix on windows since it can not be run inline with
other commands.
2018-08-27 00:44:35 -07:00
Daniel A. Wozniak
19911987b7
Fix review nits 2018-08-26 17:03:16 -07:00
Daniel A. Wozniak
6abc2daf56
Re-factor dedent to fix warts
- textwarp.dedent does not support bytes on py3
- make sure to preserve trailing newlines
2018-08-24 10:46:50 -07:00
Daniel A. Wozniak
75b2e3d990
Use salt.utils.to_* functions 2018-08-24 09:35:02 -07:00
Daniel A. Wozniak
fa78a7b2ee
Add dedent that sets line endings 2018-08-24 09:35:00 -07:00
Michael Calmer
6224f7b551
calling range is going up to the upper limit but not including it 2018-08-23 13:08:04 -04:00
Erik Johnson
8bda1e5ae3
Merge pull request #49091 from terminalmage/rename-test-files
Rename/re-organize test files in 2018.3 branch
2018-08-17 07:26:43 -05:00
Erik Johnson
ec258e235d
Add integration tests for yaml and json filters 2018-08-14 17:02:17 -05:00
Erik Johnson
fa76cb6ada
Move inspectlib tests to conform with naming convention 2018-08-14 13:53:29 -05:00