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
96,290 Commits 24 Branches 182 Tags 341 MiB
3d52b26cbd
Commit Graph

14377 Commits

Author SHA1 Message Date
Ch3LL
89b4e096db
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py
 2018-12-14 11:15:48 -05:00
Daniel Wozniak
6ea059d308
Merge pull request #50843 from bdrung/fix-tests 
Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi
 2018-12-12 13:36:31 -07:00
Benjamin Drung
0d00ae4f8e Fix RemoveCapacityFromDiskgroupTestCase require pyvmomi 
If the `pyvmomi` library is missing, all tests from the
tests.unit.modules.RemoveCapacityFromDiskgroupTestCase will fail:

```
ERROR: test__get_proxy_target_call
(unit.modules.test_vsphere.RemoveCapacityFromDiskgroupTestCase)
[CPU:0.0%|MEM:35.1%]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/modules/vsphere.py", line 381, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "salt/utils/vmware.py", line 485, in disconnect
    Disconnect(service_instance)
NameError: name 'Disconnect' is not defined

During handling of the above exception, another exception occurred:

Traceback (most recent call last):
  File "tests/unit/modules/test_vsphere.py", line 1568, in test__get_proxy_target_call
    capacity_disk_ids=['fake_disk1', 'fake_disk2'])
  File "salt/modules/vsphere.py", line 295, in __supports_proxies
    return fn(*args, **salt.utils.args.clean_kwargs(**kwargs))
  File "salt/modules/vsphere.py", line 386, in _gets_service_instance_via_proxy
    salt.utils.vmware.disconnect(local_service_instance)
  File "/home/bdrung/projects/salt/debian/salt/utils/vmware.py", line 486, in disconnect
    except vim.fault.NoPermission as exc:
NameError: name 'vim' is not defined
```

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
 2018-12-12 20:21:49 +01:00
Erik Johnson
1a00abc5f6
Add unit test for _get_proc_cmdline 2018-12-12 11:41:18 -06:00
Erik Johnson
9eaa2edfe3
Remove extraneous comments 2018-12-12 11:11:12 -06:00
Jenkins
f077783cbd
Add some tests 2018-12-10 13:43:54 -07:00
Mike Place
b1e5f3f887
Merge pull request #50709 from mattLLVW/service_unmask 
service.running unmask option
 2018-12-10 12:13:31 -07:00
Mike Place
9f8289be9c
Merge pull request #50692 from terminalmage/update-tests 
Update a couple test modules to use with_tempdir/with_tempfile decorators
 2018-12-10 10:24:02 -07:00
Mike Place
3a71567f43
Merge pull request #50768 from sathieu/git_pillar_all_saltenvs 
git_pillar: Add support for all_saltenvs parameter
 2018-12-10 09:39:36 -07:00
Mike Place
12a8447741
Merge pull request #50796 from dwoz/issue48801 
Fix #48801 min, max, inact, and warn changes
 2018-12-10 09:30:13 -07:00
Michael Lustfield
d34eadec0c
Use a temp file instead of /etc/network/interfaces for unit tests. 2018-12-10 10:45:42 -05:00
Michael Lustfield
1b096fbee6
Removed python lint. 2018-12-10 10:45:01 -05:00
Michael Lustfield
638f899e6d
Added support for loopback devices to modules.debian_ip(). (Fixes: #38672) 2018-12-10 10:44:15 -05:00
Michael Lustfield
cf61c8d9cf
Added a bunch of unit tests for modules.debian_ip.build_interface(). 2018-12-10 10:44:06 -05:00
Daniel A. Wozniak
6b9522343e
fix linter errors 2018-12-07 18:41:42 -07:00
Daniel A. Wozniak
87a04df512
Fix #48801 min, max, inact, and warn changes 
The _changes method was not properlt reporting mindays, maxdays,
inactdays and warndays values
 2018-12-07 17:22:11 -07:00
Mike Place
b19925553d
Merge branch '2017.7' into service_unmask 2018-12-06 11:24:34 -07:00
Mike Place
dc9414cd0e
Merge pull request #50767 from dwoz/ldap_no_pass 
Make sure ldap passwords are honored
 2018-12-05 15:59:16 -07:00
Daniel A. Wozniak
67aa591d1e
Fix linter errors 2018-12-05 13:12:34 -07:00
Mathieu Parent
e9714126ac
git_pillar: Add support for all_saltenvs parameter 
On the road to #32245.
 2018-12-05 20:56:29 +01:00
Daniel A. Wozniak
be3945afeb
Remove crufty import 2018-12-05 12:56:16 -07:00
Daniel A. Wozniak
91f50a4ce7
Add more ldap auth tests for ZD-2993 2018-12-05 12:55:26 -07:00
Daniel A. Wozniak
055a8d5d74
Make sure ldap passwords are honored 2018-12-05 12:46:10 -07:00
Mathieu Parent
5423c27f84
git_pillar: Allow root and mountpoint parameters together 
Fixes: #50364
 2018-12-05 05:20:04 +01:00
Brandon Ewing
9931a41955
Fix last key detection in pepa key_value_to_tree 
pepa.key_value_to_tree only checks the name of the key when attempting
to identify the last key in a flattened key.  This can lead to strange
behavior when the final key name also occurs earlier in the flatkey.

This change explicitly checks that we are the final key in flatkey
prior to setting value.  Test included.

Also see mickep76/pepa#11 and mickep76/pepa#12
 2018-12-04 20:35:34 -06: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
Mike Place
36a4a1af49
Merge branch '2018.3' into update-tests 2018-12-03 13:04:16 -07:00
Erik Johnson
be14517c5c
Make x509 tests use tempfiles instead of hard-coding them 
This keeps us from needing to manually clean them up in the tearDown
 2018-12-03 13:13:14 -06:00
Daniel Wozniak
246c055676
Merge pull request #50718 from dwoz/run_run_timeout 
Honor run_run timeout for shell tests
 2018-12-03 09:00:23 -07:00
Daniel A. Wozniak
ecd84863cd
Honor run_run timeout for shell tests 2018-12-02 15:21:17 -07:00
matt LLVW
823c4ad0e3 Implement unmask in states.services 
Fixes #46014
 2018-11-30 21:55:11 +01:00
Mike Place
edaa9fed03
Merge pull request #50685 from Ch3LL/merge_2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-11-30 11:46:06 -07:00
Ch3LL
d46aff05fc
Merge branch 2017.7 into 2018.3 
Conflicts:
  - salt/modules/file.py
 2018-11-29 13:09:15 -05:00
Mike Place
a5c7639ecb
Merge pull request #50657 from terminalmage/issue49392 
Rewrite host.present state to allow for removal of entries not matching IP
 2018-11-29 10:58:39 -07:00
Erik Johnson
a394cd76f6
Update file integration tests to use decorator for tempdirs 2018-11-29 09:29:23 -06:00
Gareth J. Greenaway
6b73c7637f
When using file.replace, with the search_only option, if the pattern does not exist in the file then we should return False. 2018-11-28 09:47:24 -08:00
Erik Johnson
e4946f9cec
Rename "remove" argument to "clean" 2018-11-28 11:41:48 -06:00
Gareth J. Greenaway
0ec8bcfd2f
When using the gem installed state, when passing a version that includes greater than or less than symbols, ensure that the installed versions meets that requirement. 2018-11-27 14:02:24 -08:00
Erik Johnson
7fd3bcea47
Add remove parameter to host.present state 2018-11-27 15:13:29 -06:00
Erik Johnson
2671a30671
Add unit tests for host.present state 2018-11-27 15:13:29 -06:00
twangboy
c4cb729257
Fix path issues with the tests 2018-11-27 12:49:27 -07:00
Gareth J. Greenaway
fced78bfa7
lint 2018-11-26 11:47:56 -08:00
Gareth J. Greenaway
45a1aa3bdc
Merge branch '2017.7' into merge-2017 
Conflicts:
	tests/unit/transport/test_zeromq.py
 2018-11-26 11:37:07 -08:00
Mike Place
5b7ab35dca
Merge pull request #50130 from garethgreenaway/49957_master_schedule_ignoring_maxrunning 
[2018.3] Fixes to schedule maxrunning on master
 2018-11-26 13:35:34 -05:00
Gareth J. Greenaway
96742aed42
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-23 17:14:17 -08:00
Gareth J. Greenaway
2f6dac917b
Updating test_maxrunning_master to Mock get_running_jobs. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
4bd0406e8d
Adding integration.scheduler.test_maxrunning to ignore list. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
45e160d8fe
Adding integration.scheduler.test_maxrunning to filename_map.yml 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
44940d6c23
Ensure minion tests using minion options. 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
722be433c2
Fixing lint 2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
65b44214d4
Adding some master specific functions to uitls/masters.py to determine if a Salt process is running. Updating utils/schedule.py to use the appropriate running function either from utils/master.py or utils/minion.py depending on where the scheduled job is running. Adding tests to test maxrunning in scheduled jobs for both the minion and master. 2018-11-23 17:07:16 -08:00
Daniel A. Wozniak
a289e3cd55
Merge branch '2017.7' into zmqpubserv 2018-11-22 17:33:02 -07:00
Gareth J. Greenaway
9f422b2a06
Moving the minion_blackout code to the start of the try...except. Adding a test to ensure we get a log.exception when minion_blackout is True. 2018-11-21 14:29:45 -08:00
Gareth J. Greenaway
eb510a6675
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-21 08:51:09 -08:00
Daniel Wozniak
60b4622570
Merge pull request #50366 from jdsieci/2018.3-fix-issue50254 
2018.3 fix issue50254
 2018-11-20 13:31:29 -07:00
Gareth J. Greenaway
6d2309da50
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-20 08:44:05 -08:00
Gareth J. Greenaway
3661ee071a
Adding test=True to artifactory.download. 2018-11-19 16:42:11 -08:00
Gareth J. Greenaway
db89b27ff2
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host 2018-11-19 15:22:57 -08:00
Gareth J. Greenaway
4c85119a57
merge-forward 2017.7 to 2018.3 2018-11-19 10:39:38 -08:00
Gareth J. Greenaway
dcae2f08c4
Merge branch '2018.3' into 50266_core_virtual_grain_fixes 2018-11-16 14:48:33 -08:00
Gareth J. Greenaway
0284323d50
Ensure that verify_login is using the host from the connection_args and not the host associated with the user. Adding a test to ensure user_exists when the passed host is the MySQL wildcard %. 2018-11-16 14:01:31 -08: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
Brett Benassi
009e52d4b9
Adding tag to ec2 cloud tests 2018-11-15 15:36:05 -07: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
Daniel A. Wozniak
39e811b296
Add issue url to tests 2018-11-15 12:02:58 -07:00
Gareth J. Greenaway
4f30611c69
lint 2018-11-15 10:31:30 -08:00
Gareth J. Greenaway
4f9eb95d7f
Fixing a typo in the _virtual function, should be checking for existing grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particular Oracle Linux. 2018-11-15 10:31:30 -08:00
bornwitbugs
e59ced6507
Merge branch '2018.3' of github.com:saltstack/salt into load_beacon_fix 2018-11-14 17:54:37 +00:00
Ch3LL
178dab3a4b
Merge branch 2017.7 into 2018.3 
Conflicts:
  - doc/topics/tutorials/salt_bootstrap.rst
  - tests/integration/cloud/clouds/test_digitalocean.py
 2018-11-14 10:33:44 -05:00
Mike Place
c1dde7e9b1
Merge pull request #50328 from rallytime/fix-48734 
Fix issue with salt-run jobs.list_jobs where Target: unknown-target
 2018-11-13 12:49:57 -07:00
Nicole Thomas
c00fd43ee9
Merge pull request #50493 from rallytime/bp-50362 
Back-port #50362 to 2017.7
 2018-11-13 11:59:50 -05:00
Nicole Thomas
6b272c1d65
Merge pull request #50492 from rallytime/bp-50228-and-50443 
Back-port #50228 and #50443 to 2018.3
 2018-11-13 11:59:14 -05:00
rallytime
f578392eb4
Lint Fix: add mock_open import 2018-11-13 09:30:02 -05:00
twangboy
60559cfa8a
Remove flaky test 2018-11-13 09:25:47 -05:00
twangboy
a696a8f564
Fix test_matcher on Windows 
Fixes a timeout issue in test_salt_documentation_arguments_not_assumed
 2018-11-13 09:25:41 -05:00
Shea Craig
3c36bddd8a
Fix linting errors. 2018-11-13 09:22:24 -05:00
Shea Craig
fab57de795
Write tests to handle invalid launchd plist XML. 2018-11-13 09:21:58 -05:00
Shea Craig
bb429b0dff
Condense service result assertions, add a binary plist test. 2018-11-13 09:21:58 -05:00
Shea Craig
a809fef417
Factor out another helper function, implement broken symlink test. 2018-11-13 09:21:58 -05:00
Shea Craig
216f7ef864
Update testing for mac_utils services. 
This commit begins to go over the existing testing for mac_utils,
applying the updated best-practices from the unit testing section of the
Salt docs.

Wherever possible, I've tried to keep the data for each test within the
test, while factoring out repetitive functions. In this commit, for
example, the `os.walk` side_effect func has been factored into its own
helper function.

This commit begins looking at what is being tested for this module and
making it more specific, specifically to test one thing per test
(existing tests had multiple asserts and in some casaes were actually
malformed such that the tests would pass, but in actual use, code would
throw an exception and skip over the block).
 2018-11-13 09:21:57 -05:00
Shea Craig
ae6f49b0b1
Make test correctly generate a double exception. 2018-11-13 09:11:18 -05:00
Daniel Wozniak
7dd34386ef
Merge pull request #50456 from terminalmage/issue50218 
Two bugfixes
 2018-11-12 23:06:51 -07:00
Nicole Thomas
917781dc95
Lint: Add blank line 2018-11-12 17:47:46 -05:00
Nicole Thomas
cfb33511df
Merge pull request #50483 from rallytime/bp-50272 
Back-port #50272 to 2018.3
 2018-11-12 17:45:05 -05:00
Erik Johnson
0f02da7fec
Remove unnecessary u prefix from string literals 
These are redundant with unicode_literals being used
 2018-11-12 16:45:28 -05:00
Erik Johnson
fc26ae8ea3
Add unit test for comparing containers with the same env vars 2018-11-12 16:45:22 -05:00
rallytime
1517bb31a8
Update old utils paths to use new paths 2018-11-12 16:13:35 -05:00
rallytime
d8e7c47a05
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/support/case.py
 2018-11-12 16:11:17 -05:00
Ch3LL
3583519da4
Update digital ocean location for cloud tests 2018-11-12 15:52:32 -05:00
Nicole Thomas
b16ff9cd1c
Merge pull request #50469 from dwoz/minion_timeout_test 
Fix up integration.minion.test_timeout
 2018-11-12 11:53:45 -05:00
Erik Johnson
6143408507
Add unit test for TimedProc regression 2018-11-12 09:08:49 -06:00
Daniel A. Wozniak
794ba17c94
Reset date and time after changing 2018-11-12 00:43:22 -07: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
Daniel A. Wozniak
4f81432321
Set subscribe via sockopt for better compatibility 2018-11-11 02:17:45 -07:00
Daniel A. Wozniak
6882209e3b
More reliable pub server publishing 
- Uses existing zmq context
- Store socket in thread local storage for re-use
- Add tests to verify publish reliability
 2018-11-11 00:58:47 -07:00
bornwitbugs
d07c84d7ad
reordering ret dictionary in load test to ascending order 2018-11-11 03:47:12 +00:00
Mike Place
73ce80f6e3
Merge pull request #50417 from meaksh/2018.3-fix-git_pillar-__env__-solving-for-merging 
Get the right target when using "__env__" on git ext_pillar to avoid merging problems
 2018-11-08 10:07:02 -07:00
rallytime
2c51cf9816
Make target test job more specific to reduce test flakiness 2018-11-08 10:27:41 -05:00
Gareth J. Greenaway
469c090330
Adding a check to see if the config file exists, if not then return an empty list so we get the would be changes. Adding a test for this functionality. 2018-11-07 15:50:17 -08:00
rallytime
caace3f184
Rewrite job cache target test to be more robust 2018-11-07 17:01:06 -05:00
Pablo Suárez Hernández
71af32d31a
Remove unicode references 2018-11-07 16:55:55 +00:00
Pablo Suárez Hernández
b7af5e52c5
Test git ext_pillar across multiple repos using __env__ 2018-11-07 16:33:03 +00:00
Mike Place
c2fda9dd9c
Merge pull request #50383 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-11-06 08:51:52 -07:00
Gareth J. Greenaway
039f3d1622
Increase limit for trimming. 2018-11-05 11:22:20 -08:00
Gareth J. Greenaway
7f77bfef99
Adding test for utils/dicttrim.py 2018-11-05 10:58:36 -08:00
rallytime
e993692d01
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/master.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - tests/integration/cli/test_batch.py
 2018-11-05 12:54:30 -05:00
Nicole Thomas
3022b7db5b
Merge pull request #50347 from garethgreenaway/41342_beacon_state_module_fixes 
[2018.3] Fixes to beacon state module
 2018-11-05 09:19:40 -05:00
Daniel A. Wozniak
18b5d43d09
Increase cli batch test timeout for increased reliablity 2018-11-02 17:15:31 -07:00
Jerzy Drozdz
1ab59e7e48 Added integration tests 2018-11-02 23:02:04 +01:00
Jerzy Drozdz
110f74f3ba Added unit tests reproducing issue 2018-11-02 23:01:43 +01:00
Gareth J. Greenaway
b8ded8bf5f
Updating the swap function in the mount.swap function also check the device name when checking the fstab data. Updating tests to reflect new behavior. 2018-11-02 12:23:24 -07:00
Gareth J. Greenaway
8885d1ff3d
Merge branch '2018.3' into 41342_beacon_state_module_fixes 2018-11-02 12:08:19 -07:00
Antonio Jordan
f7041285d5
fixing type in load beacon module and adding option validators to config check function along with mock default values in test, fixes #48343 2018-11-02 18:52:12 +00:00
Antonio Jordan
4114a4f5d8
fixing type in load beacon module and adding option validators to config check function along with mock default values in test 2018-11-02 18:22:55 +00:00
lomeroe
0e011ad805 add runTest method to class for PY2 2018-11-02 08:03:43 -05:00
lomeroe
377ec095ab add a test for #47784 2018-11-02 08:03:43 -05:00
lomeroe
0a14505e21 change backslashes in comment string to fix lint error 2018-11-02 08:03:43 -05:00
lomeroe
02181d385a add fix/test for #50079 
ADML display names that have a single match in each Computer/User policy
would not work with the "short" display name, requiring either the
"long" name or the explicit policy name
 2018-11-02 08:03:43 -05:00
lomeroe
05f29511a4 more lint fixes 2018-11-02 08:03:43 -05:00
lomeroe
94b33350a8 lint fixes in test 2018-11-02 08:03:43 -05:00
lomeroe
2a79626538 update test to actually work 
update lgpo module to catch another possible case of multiple ADML names
 2018-11-02 08:03:43 -05:00
lomeroe
42840ecd9b add missing comma in function call 2018-11-02 08:03:43 -05:00
lomeroe
c283f50074 Log a warning message instead of an exception when a SID cannot be 
converted to a username (for user rights assignments)

Add a module test file
 2018-11-02 08:03:43 -05:00
Brett Benassi
346a8317b1
Updating the AMI's and sizes for the test run. 2018-11-01 19:05:49 -06:00
Gareth J. Greenaway
c2354a9cb1
Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs. 2018-11-01 16:47:02 -07:00
Gareth J. Greenaway
2390f471ce
Adding SaltReturnAssertsMixin back in 2018-11-01 15:22:18 -07:00
Gareth J. Greenaway
677d0908fd
Remove zookeeper reference. 2018-11-01 15:05:42 -07:00
Gareth J. Greenaway
f3dee43bf0
Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format. 2018-11-01 15:02:21 -07:00
Mike Place
51e333ada2
Merge pull request #50316 from rallytime/bp-50301 
Back-port #50301 to 2018.3
 2018-11-01 17:32:04 +01:00
Anthony Shaw
529687a855
update test assertions 2018-11-01 08:41:53 +11:00
rallytime
b29fcfabbb
New test must be py3 compatible...oops. :) 2018-10-31 12:52:58 -04:00
rallytime
6859e0e6e2
Add regression test for issue #48734 2018-10-31 12:03:14 -04:00
Anthony Shaw
ba526ad149
remove unused import 2018-10-30 14:38:22 -04:00
Anthony Shaw
220e57f848
create 2 simple unit tests for the netyang state module and fix issue in #47425 2018-10-30 14:38:22 -04:00
Anthony Shaw
20bf3067b9
reproduce bug in 47425 2018-10-30 14:38:22 -04:00
Nicole Thomas
1aae681229
Merge branch '2018.3' into bp-50230 2018-10-30 12:26:15 -04:00
rallytime
381a59d56e
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/states/pip_state.py
  - tests/integration/cloud/clouds/test_ec2.py
 2018-10-30 11:41:18 -04:00
rallytime
f23852207f
Fix matcher grain file 
This was inadvertently changed in th filename_map backport.

This commit restores the matcher grain file to match all branches previous
to the inadvertent change.
 2018-10-30 09:51:51 -04:00
Brett Benassi
80982ada82
Removing an un needed change and maybe fixing the lint error 2018-10-29 15:30:51 -06:00
rallytime
1ef712a178
Add various ssh tests to the filemap for salt/utils/vt.py changes 
Some of the salt-ssh tests use the salt/utils/vt.py functions. A recent
change in that file caused about 90 tests to start failing on the branch.

We need to make sure these tests run when changes to the vt.py util are
made in PRs.
 2018-10-29 16:40:23 -04:00
Daniel Wallace
fb43061cb1
fix test 2018-10-29 14:45:23 -05:00
Daniel Wallace
5eb0e37f4e
add extra space to localemod test 2018-10-29 14:31:36 -05:00
Nicole Thomas
10ba8b42a8
Merge pull request #50276 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-29 15:05:14 -04:00
Nicole Thomas
0f1dc08d41
Merge pull request #50282 from twangboy/fix_test_diskusage 
Fix `unit.beacons.test_diskusage` on Windows
 2018-10-29 14:37:12 -04:00
twangboy
fd369dd115
Mock is_windows = False 2018-10-29 10:25:56 -06: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
f05abb09de
Merge branch '2017.7' into '2018.3' 2018-10-29 11:22:36 -04:00
Nicole Thomas
4fdcf7c4a7
Lint: Add extra blank line 2018-10-29 11:17:12 -04:00
Brett Benassi
cebfd8ad03
Fixing lint error 2018-10-29 09:08:48 -06:00
rallytime
113d76e045
Revert "Move jinja templating tests alongside salt/utils/jinja.py's tests" 
This reverts commit 6d9c2eb6b0.
 2018-10-29 11:05:33 -04:00
Brett Benassi
2df611565a
Adding subnetID so it knows the right VPC to build the node in. 2018-10-29 08:57:22 -06:00
rallytime
8968f9d164
Revert "Rename test_map_conf test file to respect naming convention" 
This reverts commit 8326a09921.
 2018-10-29 10:46:29 -04:00
rallytime
85a9395c2a
Remove saltclass pillar unit test for list expansion 
This test only applies to functionality present in Fluorine or newer.

This commit will need to be reverted again in the fluorine branch.
 2018-10-29 10:34:24 -04:00
rallytime
3d95673be0
Use get_config_dir() instead of self.config_dir 
This attribute does not exist in the 2018.3 branch. Use the function
for now, and then change this back on the merge-forward.
 2018-10-29 10:23:00 -04:00
rallytime
e8b3a62b31
Add init file back in for unit/client pkg 
This file was accidentally removed during some test renaming. The absence
of this file prevents the test from running due to an ImportError.
 2018-10-29 10:19:52 -04:00
rallytime
a0cfbdcb79
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-29 09:55:06 -04:00
Brett Benassi
6a1e9f0a7f
Adding securitygroupname as the config instead of securitygroup 2018-10-26 15:38:48 -06:00
Cédric Bosdonnat
d527dd29cc
Rename states/test_libvirt.py into states/test_virt.py 
Modules test files are named after the module itself, the state virt
module needs to comply with that rule too.
 2018-10-26 16:05:03 -04:00
rallytime
ab4a670ff2
Remove pgjsonb returner unit tests 
The tests that are written in this file are for functions not present
in the 2018.3 branch.

This commit will need to be reverted in the merge-forward to `fluorine`.
 2018-10-26 15:58:46 -04:00
rallytime
68ab3eef55
Remove "test_custom" from grains section of filename_map 
This test is for functionality only available in fluorine and newer.

Removing this for 2018.3.
 2018-10-26 15:17:12 -04:00
rallytime
68146983cb
Remove test_error from scheduler tests 
These tests are not present on 2018.3
 2018-10-26 14:54:25 -04:00
rallytime
c55dcf02eb
Add init file back in for integration/cloud/clouds pkg 
This was accdientally removed during some cloud test file renaming, which
prevents the test from running due to an ImportError
 2018-10-26 14:32:03 -04:00
rallytime
dfa05b978e
Remove test files for beacons that don't exist in 2018.3 2018-10-25 11:16:11 -04:00
Nicole Thomas
9ad43f2b71
Merge pull request #50063 from twangboy/fix_50039 
Use long when setting REG_QWORD
 2018-10-25 09:45:02 -04:00
Nicole Thomas
01b083e20b
Merge pull request #50188 from garethgreenaway/49965_beacon_diskusage_windows 
[2018.3] fixes to diskusage beacon
 2018-10-25 09:41:18 -04:00
Nicole Thomas
9ea51c00bd
Merge pull request #50214 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-10-25 09:38:39 -04:00
Gareth J. Greenaway
685509fae3
Fixing an issue when a combination of the when parameter as a list plus using the splay parameter would cause the schedule to continuously run jobs in an endless loop, regardless of if their scheduled time had been receached. Also fixing a related issue where scheduled jobs that rely on _next_fire_time were not being run as the corrected splayed time but rather running at the original scheduled time. Adding new tests. 2018-10-24 17:22:37 -07:00
Daniel Wozniak
43303fb6cd
Merge pull request #50190 from dwoz/grains_template_test 
Fix test_managed_file_with_grains_data on Windows
 2018-10-24 15:43:35 -07:00
rallytime
897145c4a1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-24 15:54:15 -04:00
Nicole Thomas
462314b286
Merge pull request #50187 from garethgreenaway/port_49871_to_2018_3 
[2018.3] Adding fixes to scheduler tests to 2018.3
 2018-10-24 15:45:31 -04:00
Nicole Thomas
8ad9a1bd61
Merge pull request #50201 from Ch3LL/_2018.3.3 
[2018.3] Ensure that tokens are hex to avoid hanging/errors in cherrypy
 2018-10-24 15:44:23 -04:00
Nicole Thomas
017d39400a
Merge pull request #50202 from Ch3LL/_2017.7.8 
[2017.7] Ensure that tokens are hex to avoid hanging/errors in cherrypy
 2018-10-24 15:42:11 -04:00
twangboy
84b8dd6856
Add tests 2018-10-24 11:49:01 -06: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
Gareth J. Greenaway
d232dfb9b7
Update test_eval.py 2018-10-24 09:37:23 -07:00
Daniel A. Wozniak
b77db48d77
Fix test_managed_file_with_grains_data on Windows 2018-10-23 22:58:09 -07:00
Gareth J. Greenaway
42b3203cf9
Fixing lint 2018-10-23 19:14:00 -07:00
Gareth J. Greenaway
d8d8559b75
Fixing lint 2018-10-23 19:09:02 -07:00
Gareth J. Greenaway
f65fa57a10
Fixing a bug in the diskusage beacon that prevented it from working on Windows. Adding a couple tests to test functionality on Windows. 2018-10-23 19:03:19 -07:00
Gareth J. Greenaway
d2d0622a6d
Back porting #49871 to 2018.3. Adding some additional changes to ensure they are passing on OS X. 2018-10-23 15:58: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
rallytime
059754c207
Add some doc tests to the filemap that should run on every PR 
These files test aspects of the documentation that are not covered by the
pylint or doc build runs. Therefore, these should run on all incoming PRs.
 2018-10-23 14:52:19 -05:00
Erik Johnson
b1ee2e524b
Set a default value for the filename map path 2018-10-23 14:51:39 -05:00
Erik Johnson
8f790c0e74
Fix conflicting dict key in filename map 2018-10-23 14:48:32 -05:00
Erik Johnson
f2e55128bb
Evan Moar Lint 2018-10-23 14:48:32 -05:00
Erik Johnson
65fef9a7c0
Moar Lint 2018-10-23 14:48:31 -05:00
Erik Johnson
39c245525f
Lint 2018-10-23 14:48:31 -05:00
Erik Johnson
dd20f12988
Make sure we always run the module names test 2018-10-23 14:47:17 -05:00
Erik Johnson
2ac939eace
Add test to check test module names and make sure they match the naming convention 2018-10-23 14:47:17 -05:00
Erik Johnson
785d2989b9
Add integration.netapi.rest_tornado.test_app to filename map 2018-10-23 14:47:17 -05:00
Erik Johnson
662ca0de73
Rename files to match naming convention 2018-10-23 14:47:17 -05:00
Erik Johnson
186d333c92
Add back changes lost in cherry-pick 2018-10-23 14:46:05 -05:00
Erik Johnson
a2365317f2
Add back test accidentally deleted when cherry-picking 2018-10-23 14:46:05 -05:00
Erik Johnson
eaa4da3d49
Rename providers to clouds to respect naming convention 
Also, move rackspace openstack-based tests to test_openstack.py
 2018-10-23 14:46:05 -05:00
Erik Johnson
85b96de009
Rename some files to avoid them being identified as test modules 2018-10-23 14:41:06 -05:00
Erik Johnson
bfb6015428
Rename/consolidate salt.utils unit tests to conform to naming convention 2018-10-23 14:39:17 -05:00
Erik Johnson
84749dd854
Consolitdate and move salt-ssh unit tests to proper location 2018-10-23 14:33:43 -05:00
Erik Johnson
71825a596e
Consolidate and move loader tests to test/unit/test_loader.py 2018-10-23 14:31:08 -05:00
Erik Johnson
8326a09921
Rename test_map_conf test file to respect naming convention 2018-10-23 14:29:02 -05:00
Erik Johnson
6d9c2eb6b0
Move jinja templating tests alongside salt/utils/jinja.py's tests 2018-10-23 14:28:45 -05:00
Erik Johnson
1ef43a34bd
Add additional paths to the filename map 2018-10-23 14:22:07 -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
c5593bc843
Rename custom_grains.py so it's not identified as a test module 2018-10-23 14:22:07 -05:00
Erik Johnson
330c21179a
Consolidate saltclass pillar unit tests into single module 2018-10-23 14:21:48 -05:00
Erik Johnson
a642619fa9
Rename test pgjsonb returner test file to match naming convention 2018-10-23 14:21:48 -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
3f1b6fd661
Add more unit test mapping 2018-10-23 14:21:21 -05:00
Erik Johnson
ac3406d031
Fill out the filename map a bit 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
b851a41ef8
Don't run unit or integration tests unnecessarily 
If --from-filenames (and optionally --filename-map) yield no matches,
this will keep from running the entire unit/integration suite.
 2018-10-23 14:21:21 -05:00
Erik Johnson
569276bedf
Add an initial filename_map 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
m03
f5d6080237
Add test_to_none 2018-10-23 10:30:31 -04:00
Gareth J. Greenaway
8fa87e3dc9
Update test_network.py 2018-10-21 08:39:29 -07:00
Gareth J. Greenaway
311796994b
Fixing scenario where the interface for the default route has a dash in it, regular expression used in get_route currently doesn't not account for this.. Adding some additional tests for network.get_route. 2018-10-20 15:57:25 -07:00
Daniel Wozniak
0ece06ef66
Merge pull request #50085 from dwoz/win_pkg_redux 
Fix `test_win_pkg` yet again
 2018-10-19 11:16:15 -07:00
Mike Place
de23c83f54
Merge pull request #50114 from rallytime/bp-50061 
Back-port #50061 to 2018.3
 2018-10-19 05:46:02 -06:00
Mike Place
9188bec831
Merge pull request #50115 from garethgreenaway/apply_49104_to_2018_3 
[2018.3] Apply scheduler fixes and tests from #49104 to 2018.3
 2018-10-19 05:45:30 -06:00
Erik Johnson
91812ff510
Squelch spurious errors logged in unit tests 
We are getting errors in the LazyLoader because certain functions are
not present in the LazyDict due to being left out of the whitelist.
These don't cause the tests to fail, but they do result in a lot of
spurious errors in the test suite.
 2018-10-18 14:01:28 -05:00
Gareth J. Greenaway
adb1e79723
Apply scheduler fixes and tests from #49104 to 2018.3 2018-10-18 08:27:59 -07:00
Erik Johnson
1f09104b0d
Add unit test for pkg.install with epoch 2018-10-18 11:16:58 -04:00
Mike Place
f22630eacb
Merge branch '2018.3' into win_pkg_redux 2018-10-18 13:06:31 +02:00
rallytime
8609064f30
Update old utils paths to use new paths 2018-10-17 10:24:26 -04:00
rallytime
a984ad8b3d
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-10-17 10:21:42 -04:00
Nicole Thomas
7ec3840d25
Merge pull request #49794 from twangboy/fix_groupadd_test 
Fix possible issue with test_groupadd
 2018-10-17 10:20:33 -04:00
Daniel A. Wozniak
9f5722a71d
The test is not a flush problem 2018-10-16 22:22:49 -07:00
Daniel A. Wozniak
128c2c5423
Flush and sync file contents 2018-10-16 12:40:23 -07:00
Mike Place
f3fe4b67f7
Merge pull request #50064 from rallytime/bp-50022 
Back-port #50022 to 2018.3
 2018-10-16 11:09:46 +02:00
Daniel Wallace
4c4bb5a489
Merge pull request #49987 from terminalmage/pillar_roots 
Make Pillar no longer munge file_roots
 2018-10-15 16:58:08 -05:00
Brian Saville
40da3ce2d0
Make test check_pillar more lenient 2018-10-15 16:50:57 -04:00
Erik Johnson
f59506d4cc
Update tests to reflect behavior changes 2018-10-15 10:16:44 -05:00
Daniel Wozniak
fef7669a15
Merge pull request #49809 from Ch3LL/win_pkg_flaky 
Add additional asserts to help investigate test_win_pkg failure
 2018-10-13 11:00:08 -07:00
Daniel A. Wozniak
beaab2a05a
Fix win_pkg test 
Bugfix in file_list cache. The file_list cache age could be a negative
number meaning the file_list cache can get used in tests even though the
cache timeout is set to 0 for test suite runs.
 2018-10-11 15:47:44 -07:00
Erik Johnson
58f5fde03c
Make Pillar no longer munge file_roots 
Pillar and the local fileclient used to use the same class, but this
changed a few years ago with the introduction of FSClient (which enabled
non-roots fileserver backends in masterless Salt). Since Pillar is the
only thing that uses this client, there is no longer a reason to make
Pillar modify file_roots.
 2018-10-10 13:10:50 -05:00
Nicole Thomas
c912d3a288
Merge pull request #49946 from isbm/isbm-osversion_info-fixes 
osversion/osversion_info/osmajorrelease grains fixes
 2018-10-10 10:01:03 -04:00
Nicole Thomas
18fb5df639
Merge pull request #49918 from garethgreenaway/48204_mysql_user_password_exception_part_deux 
[2018.3] Fixes to MySQL module
 2018-10-10 10:00:10 -04:00
Nicole Thomas
e427306da7
Merge pull request #49907 from brejoc/2018.3-fix-for-list-compound-targeting 
2018.3 fix for list compound targeting
 2018-10-10 09:33:39 -04:00
Mike Place
92c06800e0
Merge branch '2018.3' into 48204_mysql_user_password_exception_part_deux 2018-10-09 10:01:45 -06:00
Bo Maryniuk
a17ba35a5b Fix proper part name in the string-bound CPE 2018-10-09 16:37:15 +02:00
Bo Maryniuk
9d4960752e Expand unit test to verify part name 2018-10-09 16:36:53 +02:00
rallytime
df11c396ec
Skip pillar refresh test 
This test is flaky and fails intermittently, even with the `flaky` decoractor.

Skipping for now until we can debug further.
 2018-10-09 10:26:45 -04:00
Bo Maryniuk
712083df0e Add unit test for broken CPE_NAME 2018-10-09 14:11:56 +02:00
Bo Maryniuk
1306ddb111 Add unit test for v2.3 of CPE format 2018-10-09 14:11:42 +02:00