Bo Maryniuk
d5d653af45
Add unit test for file.line on no location/before/after check failure
2017-11-10 19:50:46 +01:00
Bo Maryniuk
5b76c41f44
Move all file.line unit tests to the own class
2017-11-10 19:50:46 +01:00
Bo Maryniuk
f0f08a10e8
Add unit test for file.line on an empty content while not deleting anything
2017-11-10 19:50:46 +01:00
Bo Maryniuk
b5a80231bd
Rename a unit test and clarify its purpose in docs
2017-11-10 19:50:46 +01:00
Bo Maryniuk
cf191b01d6
Add unit test for file.line on mode checks
2017-11-10 19:50:46 +01:00
Nicole Thomas
5505a8819a
Merge branch '2017.7' into win_unit_test_archive
2017-11-10 11:48:51 -07:00
Mike Place
8b834e341d
Merge pull request #44288 from eradman/onlyif_unless
...
Report 'onlyif' and 'unless' conditions as true or false
2017-11-10 11:37:01 -07:00
Ch3LL
e952cd6712
Enable test_deploy ssh test
2017-11-10 13:35:13 -05:00
twangboy
6c872e95e6
Add back the setup_loader_modules function
...
Use empty dict instead of defining wmi
2017-11-10 11:30:00 -07:00
Erik Johnson
20273e3697
No need for setup_loader_modules since we're actually importing wmi
2017-11-10 11:29:59 -07:00
twangboy
8c107873cd
Remove wmi monkeypatching
...
The WMI object was being monkey patched in the global namespace causing
other tests to fail
2017-11-10 11:29:54 -07:00
Mike Place
cc08ad2edc
Merge pull request #44317 from Ch3LL/ssh_test
...
Add state tests and state request system to salt-ssh
2017-11-10 11:28:42 -07:00
Nicole Thomas
9302149604
Merge branch 'develop' into develop
2017-11-10 10:56:12 -07:00
Nicole Thomas
0a8419358b
Merge branch 'develop' into separate-key-dir-from-cache-dir
2017-11-10 10:39:53 -07:00
Nicole Thomas
9fb9fecfa7
Merge branch 'develop' into 42713_mine.get_back_compat
2017-11-10 10:06:11 -07:00
Ch3LL
f3ec6df76e
Add orchestration tests when target exists or not
2017-11-10 12:00:12 -05:00
Ch3LL
46bce3bd5e
add additional parser argument for ssh integration tests
2017-11-10 10:58:38 -05:00
Ch3LL
e9231430b5
remove logic similar to cloud/proxy tests
2017-11-10 10:48:31 -05:00
Ch3LL
c731eb8ea6
add ssh dir to test runner when --ssh-tests set
2017-11-10 10:48:31 -05:00
Ch3LL
8089a885c2
add wipe function to other run_ssh method
2017-11-10 10:48:31 -05:00
Ch3LL
e3ebb5e9b3
fix comment and variables
2017-11-10 10:48:30 -05:00
Ch3LL
faef0886a7
Add state tests and state request system to salt-ssh
2017-11-10 10:48:30 -05:00
Ch3LL
12fed1b4d8
Add integration pillar command line test
2017-11-10 10:43:37 -05:00
rallytime
9fcc2a70b5
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- tests/unit/modules/test_rh_ip.py
2017-11-10 10:33:25 -05:00
twangboy
0a9e862bf4
Use regex to split
2017-11-09 16:24:19 -07:00
twangboy
b1dfe9c3c8
Format patching with statements for easier reading
2017-11-09 14:32:21 -07:00
twangboy
ba2f2eb788
Add Erik's changes
2017-11-09 14:32:21 -07:00
twangboy
4ef1e3eb97
Fix unit.states.test_archive for Windows
...
Use os agnostic paths
Mock `salt.utils.which` for Windows
Handle urlparse return on Windows
2017-11-09 14:32:21 -07:00
Erik Johnson
c1b6d35c0c
Python 3 compatibility fixes for kubernetes
...
dict.keys() is not a list in Python 3, and base64.b64encode requires
a bytestring.
2017-11-09 15:05:43 -06:00
Erik Johnson
b6ccfb45c8
Wait until after restoring original resource limit before removing temp files
...
Invoking shutil.rmtree() first was causing a traceback since the max
open files setting was still set very low for the test. This moves the
shutil.rmtree() until after we have restored the original resource
limit.
2017-11-09 15:05:43 -06:00
Erik Johnson
8a7d56369c
Use with blocks (or try/finally) to ensure filehandles are closed
...
This fixes a few sources (or potential sources) of filehandle leaks.
2017-11-09 15:05:40 -06:00
Gareth J. Greenaway
7cdf703884
Updating tests for watch_any_fail and require_any_fail.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
4dbd3e5567
Updating unit tests to limit to two required states.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
efbfa5abf2
Adding state file used in integration tests.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
58d22a169c
Adding docs and integration tests.
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
3ffab16a4d
If a state is in prerequired, do not add to the self.pre to the list of requirements.
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
d9dcb84fe3
tweaking
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
d2bfa95018
Merging in watch_any changes
2017-11-08 16:06:43 -08:00
Nicole Thomas
2bf0df89cd
Merge pull request #44403 from eradman/swap_total
...
Implement swap_total grain on OpenBSD
2017-11-08 14:48:45 -07:00
Erik Johnson
5932e8a8ae
Merge pull request #44407 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-08 11:50:05 -08:00
Eric Radman
26417d8e83
Add integration test for (mem|swap)_total grains on OpenBSD
2017-11-08 14:38:20 -05:00
Ch3LL
5d1a9af4b5
Add salt-ssh grains.items test
2017-11-08 13:41:11 -05:00
Gareth J. Greenaway
df937bf2fa
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-08 10:58:22 -07:00
Georges Racinet
5c01c74fbc
Merge branch 'develop' of github.com:saltstack/salt into 42713_mine.get_back_compat
...
... and fixed conflict
2017-11-08 18:09:04 +01:00
Georges Racinet
728c9b65a5
Unit test for backwards compatibility of mine.get
...
Could not find calls to RemoteFuncs in unit tests, therefore started a
new one, hope it's in the appropriate place.
The test replaces the caceh by its own (very limited) one. It's quite
possible it could be improved by reusing another one meant for unit tests.
2017-11-08 18:02:29 +01:00
Nicole Thomas
8ffe91fe44
Merge pull request #44405 from SEJeff/kubernetes-updates-v2
...
Kubernetes updates v2
2017-11-07 12:17:43 -07:00
Jorge Schrauwen
3af235250d
Remove _zpool_data from the bsd_memdata test for grains
2017-11-07 08:17:50 +01:00
Nicole Thomas
c03e997144
Merge pull request #44246 from nicholasmhughes/add-location-to-file.line-ensure
...
Add location support to file.line ensure
2017-11-06 22:35:18 -07:00
Sean Jenkins
ed8cccf457
#39901 : Fix pylint
2017-11-06 17:02:53 -07:00
Sean Jenkins
43c81dfdee
#39901 : Add unit tests
2017-11-06 15:04:22 -07:00
rallytime
f26beffe48
Update old utils paths to new paths
2017-11-05 20:39:40 -07:00
rallytime
2c052e34b3
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .gitignore
- salt/modules/win_lgpo.py
- salt/utils/__init__.py
- tests/integration/spm/test_build.py
- tests/unit/test_pydsl.py
2017-11-05 20:28:51 -07:00
Jeff Schroeder
eaaa4dcf8e
Up the total test coverage of the kubernetes state to 54%!
...
* Add 100% test coverage for the kubernetes.node_label_absent state
* Add 100% test coverage for the kubernetes.namespace_present state
* Add 100% test coverage for the kubernetes.namespace_absent state
2017-11-05 20:11:25 -06:00
Jeff Schroeder
2b44f7ca85
Small formatting fixup
2017-11-05 20:11:17 -06:00
Jeff Schroeder
7039d74e90
More kubernetes state tests
...
* Add 100% test coverage for the kubernetes.secret_absent state
* Add 100% coverage for kubernetes.node_label_present
* Also add 'comment' to kubernetes.node_add_label
* Make the faux test objects more believable in test_kubernetes.py
2017-11-05 17:57:29 -06:00
Jeff Schroeder
2b02a46544
Add the beginning of tests for states.kubernetes and update things
...
* Add 100% test coverage for the kubernetes.secret_present state
* Add 100% test coverage for the kubernetes.configmap_absent state
* Add 100% test coverage for the kubernetes.configmap_present state
* Make some fields optional to kubernetes.create_secret and add examples
* Make some fields optional to kubernetes.replace_secret and add examples
* Make some fields optional to kubernetes.create_configmap and add examples
* Make some fields optional to kubernetes.replace_configmap and add examples
* Add 'comment' when a kubernetes configmap or secret is going to be replaced
* Update 'source', 'template', and 'saltenv' kwargs to defaults from the rest of the codebase
* Allow passing empty 'data' to the kubernetes.configmap_present state to remove the existing contents
2017-11-05 13:34:37 -06:00
Mike Place
1412a42f0e
Merge pull request #44070 from gtmanfred/kitchen
...
begin adding kitchen-salt into the test suite
2017-11-02 15:55:33 -06:00
Benedikt Werner
4a63798e84
Fixed linting
2017-11-01 01:01:22 +01:00
Ch3LL
952c6bfea4
Include file size check for test_spm_build_big_file test
2017-10-31 18:18:37 -04:00
Benedikt Werner
7bb85f417f
Merge branch 'develop' into develop
2017-10-31 23:15:03 +01:00
Mike Place
c46490c183
Merge pull request #44190 from prymitive/postgres_extension
...
Fix test=true checks so that state runs in test mode don't report cha…
2017-10-31 11:53:06 -06:00
Mike Place
57705b9e6a
Merge pull request #44231 from SEJeff/kubernetes-stuff
...
Kubernetes module updates round one
2017-10-31 11:21:28 -06:00
Gareth J. Greenaway
06080612bc
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-10-30 17:54:57 -04:00
Daniel Wallace
947bb86695
comment wordpress module
2017-10-30 13:34:28 -06:00
Daniel Wallace
2659b8b03e
remove pypi.c7 from tests
2017-10-30 13:05:35 -06:00
Nicole Thomas
835e6714ae
Merge branch 'develop' into publish_refactor_use_check_authentication
2017-10-30 11:06:59 -04:00
Nicole Thomas
716aabc0bf
Merge branch '2017.7' into service_test
2017-10-29 11:32:33 -04:00
Ch3LL
dd5c823210
remove skipIf import
2017-10-27 15:01:32 -04:00
rallytime
6d2490f6a0
Fix lint failure on 2017.7 branch
2017-10-27 13:03:01 -04:00
Nicole Thomas
9fc7fde8d2
Merge pull request #43885 from garethgreenaway/43825_swap_total_grain
...
[develop] Adding swap_total to core grains
2017-10-27 13:01:11 -04:00
Nicole Thomas
b2b0c770a4
Merge pull request #44279 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-10-27 12:17:18 -04:00
Erik Johnson
bd5b9dd0aa
Merge pull request #44291 from Ch3LL/pillar_test
...
add saltutil.refresh_pillar test
2017-10-27 10:19:42 -05:00
Erik Johnson
17d8e46abf
Merge pull request #44277 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-27 10:16:00 -05:00
Nicole Thomas
cf77a6bf0f
Merge pull request #43754 from spenceation/panos-2017-9-26
...
Update to PANOS modules.
2017-10-27 10:36:02 -04:00
Jeff Schroeder
1576c9980c
Fix test_kubernetes.py after fixing bug in 25f7c4996730a578b7875e924508a5c1774e8b7c
2017-10-26 18:20:49 -05:00
Jeff Schroeder
9304a428e3
Add the change-cause annotation to kubernetes created objects
...
This allows commands such as `kubectl rollout history deploy/$FOO` to
automatically show the deployment changed as a result of the salt run
and follows exactly how kubectl works when passed the `--record` flag.
2017-10-26 18:20:41 -05:00
Jeff Schroeder
9ceabf29f4
Fix kubernetes.node_labels()
...
This prevented showing, adding, or removing any labels from nodes
2017-10-26 18:20:34 -05:00
Jeff Schroeder
ac20ddfa25
Fix a bug in the kubernetes module for ssl cert paths
...
When the `client_key_file` attribute was defined and the `client_key`
attribute was not, the conditional for `client_key` would wrongly zero
`kubernetes.client.configuration.key_file`.
This was a bit annoying to figure out, but the kubernetes module now can
authenticate with minikube with a configuration such as this (where jeff
is $USER):
kubernetes.api_url: 'https://192.168.99.100:8443 '
kubernetes.certificate-authority-file: '/home/jeff/.minikube/ca.crt'
kubernetes.client-certificate-file: '/home/jeff/.minikube/client.crt'
kubernetes.client-key-file: '/home/jeff/.minikube/client.key'
The various options can be gotten from ~/.kube/config after running `minikube start`.
2017-10-26 18:20:28 -05:00
Nicole Thomas
e16707c403
Merge pull request #44285 from Ch3LL/all_spm
...
add spm integration tests for remove and build
2017-10-26 17:20:09 -04:00
Ch3LL
ff92f31cbe
remove skipif for docker
2017-10-26 14:43:31 -04:00
twangboy
6db23757bc
Fix test_pydsl on Windows
...
Fix salt.utils.fopen to handle the 't' mode correctly in Windows
Fix the test_pysl test issues with spacing and file paths
2017-10-26 10:18:07 -06:00
Ch3LL
c13f37eee4
change service name depending on os
2017-10-26 11:44:38 -04:00
Ch3LL
1f77f3e6a3
add skipif logic for fallocate cmd
2017-10-26 10:09:33 -04:00
Ch3LL
34e2955445
add saltutil.refresh_pillar test
2017-10-25 15:56:49 -04:00
rallytime
8237f45a46
Add print_function to __future__ import list
2017-10-25 14:54:03 -04:00
Ch3LL
980c43ebc9
change skip message check to docker
2017-10-25 13:43:13 -04:00
Ch3LL
3955537609
change skip if check to docker
2017-10-25 13:40:58 -04:00
Ch3LL
aa8875a0e2
change service name to docker
2017-10-25 13:39:46 -04:00
Ch3LL
03b5c4bc6d
add spm integration tests for remove and build
2017-10-25 12:09:51 -04:00
Ch3LL
0a387c2ecd
fix pylint
2017-10-25 12:08:29 -04:00
Ch3LL
f383f05a93
Add SPM create_repo integration test
2017-10-25 12:06:08 -04:00
rallytime
055b0701de
Lint fix from sloppy merge conflict resolution
2017-10-25 11:58:44 -04:00
Eric Radman
d921e1e6cb
Report 'onlyif' and 'unless' conditions as true or false
...
Elide terminology "execution failed/succeeded" since the result of these
conditions does not indicate a failure in state execution. Instead
simply report the result of each condition.
2017-10-25 11:03:13 -04:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- .gitignore
- tests/unit/states/test_file.py
2017-10-25 10:04:08 -04:00
rallytime
8a1c575ae5
Update salt.utils.fopen calls to new salt.utils.files.fopen path
2017-10-25 09:59:04 -04:00
rallytime
28343f0120
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/git.py
2017-10-25 09:54:37 -04:00
Mike Place
bd75be24ca
Merge pull request #44253 from Ch3LL/spm_install
...
Add multiple spm integration tests
2017-10-25 15:36:02 +02:00
Mike Place
75ee1ebc50
Merge pull request #44254 from twangboy/win_fix_test_win_groupadd
...
Fix `unit.modules.test_win_groupadd` for Windows
2017-10-25 15:33:39 +02:00
Ch3LL
e5701b472d
Add state, grains and service proxy tests
2017-10-24 16:59:56 -04:00
Ch3LL
654071028b
change service to crond
2017-10-24 16:26:31 -04:00
Ch3LL
7911b4b3eb
Add service.status integration test
2017-10-24 16:25:19 -04:00
Daniel Wallace
56a3ad8f68
fix pylint comments
2017-10-24 12:18:27 -06:00
Daniel Wallace
4add666db1
add comment to Gemfile and move copyartifacts
...
moved copyartifacts.py to tests/support
Also added a comment to the Gemfile that this is only used to run the testsuite with kitchen-salt
2017-10-24 12:01:57 -06:00
Daniel Wallace
b4c8f7eb57
fix pylint
2017-10-24 10:44:25 -06:00
Daniel Wallace
1b8bd64a88
Merge branch 'develop' into develop
2017-10-24 10:42:22 -06:00
twangboy
609361bf48
Fix some lint errors
2017-10-24 09:27:39 -06:00
twangboy
7a3ff9387d
Mock the rest of the tests
2017-10-24 09:27:38 -06:00
Erik Johnson
5ce14df82c
Change how members are retrieved in win_groupadd
...
This is a solution that works for the other functions that interact with
group objects, making it a better overall solution to be used widely
in win_groupadd.
This also updates the mocking in the tests such that we use a more
comprehensive fake class, and more intelligent mocking of get_sam_name
using a lambda.
2017-10-24 09:27:38 -06:00
twangboy
6ab82394be
Set up mocking
...
Move the code that sets up the group object, computer object and gets
existing members out of the individual functions so they can be mocked
Mock the GroupObj
Mock the ComputerObj
Mock existing members
Still need to fix info, getent, and members
2017-10-24 09:27:37 -06:00
Daniel Wallace
79251287d0
add logging
2017-10-24 09:23:46 -06:00
Daniel Wallace
38963d5a82
use transport if not set in state_file
2017-10-24 09:23:46 -06:00
Daniel Wallace
7465f9b27a
add script for copying back artifacts
2017-10-24 09:23:46 -06:00
Ch3LL
9e2e785034
add spm tests to test runner
2017-10-24 10:33:53 -04:00
Sol Kim
af2d6a0441
Merge branch 'develop' into separate-key-dir-from-cache-dir
2017-10-24 11:00:19 +09:00
Łukasz Mierzwa
58b84c7f71
Fix test case when postgres extension is already present and test=true is passed
...
Currently test expects that if the extension is already present salt will indicate that it will create it (which won't really happen without test=true since the extension is present), state was fixed so now salt will return correct information with test=true so fix the test to follow correct behaviour.
2017-10-23 17:48:27 -07:00
Ch3LL
4729ccd32b
Add multiple spm integration tests
2017-10-23 17:13:32 -04:00
Nicole Thomas
4278a08e40
Merge pull request #44194 from vernondcole/saltify-create-with-wake-on-lan
...
add wake-on-LAN feature to saltify create
2017-10-23 10:46:21 -04:00
nicholasmhughes
fa1c442943
added support for location in file.line when using ensure
2017-10-23 10:40:35 -04:00
Nicole Thomas
304dd2529d
Merge pull request #44160 from gtmanfred/directory
...
add changes to test return
2017-10-23 10:35:20 -04:00
Nicole Thomas
2ccfaca66c
Merge pull request #44067 from eradman/check_file_meta
...
Check file attributes if lsattr(1) is installed
2017-10-23 10:30:58 -04:00
Erik Johnson
96891a062a
Merge pull request #44203 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-23 09:11:54 -05:00
Nicole Thomas
7374403eca
Merge pull request #44225 from eradman/test_btmp_wtmp
...
Mock open on /var/log/btmp and /var/log/wtmp
2017-10-23 09:51:46 -04:00
Eric Radman
10d13062ec
Mock open to /var/log/btmp and /var/log/wtmp
...
- btmp may not exist
- wtmp may not exist, or it may not contain ASCII data
Unbreaks tests on OpenBSD 6.2
2017-10-21 09:50:08 -04:00
Roald Nefs
f430e1e33c
Added simple test for Telegram returner
2017-10-20 20:55:54 +02:00
Nicole Thomas
012477071f
Merge pull request #44071 from garethgreenaway/various_beacon_fixes
...
[develop] Various fixes to beacons
2017-10-20 11:06:27 -04:00
rallytime
3b9d02977d
Update deprecated salt.utils paths to new salt.utils.x paths
2017-10-20 10:48:37 -04:00
rallytime
2617cf851f
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/aptpkg.py
- salt/utils/win_functions.py
- tests/unit/states/test_mount.py
2017-10-20 10:44:29 -04:00
Nicole Thomas
c6d27ada51
Merge pull request #43843 from twangboy/win_unit_test_mount
...
Fix `unit.states.test_mount` for Windows
2017-10-20 10:27:25 -04:00
Daniel Wallace
a7d3d668f4
missed removing changes in the next test
2017-10-20 08:11:44 -06:00
Nicole Thomas
33ad43eec0
Merge pull request #44085 from kstreee/fix-inconsistent-exception-handling
...
Fixes inconsistent exception handling in rest_tornado.
2017-10-20 09:18:28 -04:00
Nicole Thomas
c700cd9c1e
Merge pull request #44162 from rallytime/jinja-test-imports
...
Reorder and group imports in jina template unit tests
2017-10-20 09:09:40 -04:00
Nicole Thomas
12980a6961
Merge pull request #43476 from Shados/ssh_known_hosts_improvements
...
Improvements to SSH known_hosts handling
2017-10-20 09:07:20 -04:00
Benedikt Werner
11920372b3
Moved patch function outside of class to fix linting
2017-10-20 14:21:45 +02:00
Benedikt Werner
295b5d4834
Added tests and doc
2017-10-20 06:02:08 +02:00
Vernon Cole
d3769b3568
add saltify wake-on-lan and document it
2017-10-19 20:14:07 -06:00
kstreee
20bf4eed1d
Separates key_dir from cache_dir, The key files (i.e. '.root_key', '.sudo_...') must not be shared with other masters.
2017-10-20 11:06:31 +09:00
Mike Place
2551454f6a
Add absolute_import
2017-10-19 18:26:08 -05:00
Eric Radman
6da4fd979b
Check file attributes in check_file_meta() if lsattr(1) is installed
...
lsattr/chattr is not installed on many Unix-like platforms by default,
including *BSD, Solaris, and minimal Linux distributions such as Alpine.
2017-10-19 18:38:12 -04:00
Mike Place
1e3abfea59
Merge branch 'develop' into various_beacon_fixes
2017-10-19 15:58:01 -05:00
Mike Place
cc2c99c94c
Merge branch 'develop' into fix-inconsistent-exception-handling
2017-10-19 15:53:24 -05:00
Mike Place
68ed8c21b2
Merge branch 'develop' into jinja-test-imports
2017-10-19 15:42:20 -05:00
Mike Place
75136152c1
Merge pull request #44187 from twangboy/win_fix_unit_test_daemons.py
...
Fix pickling errors on Windows
2017-10-19 15:36:50 -05:00
Mike Place
5ef124bf2d
Merge pull request #44171 from Ch3LL/spm_int
...
Add SPM Build Integration Tests
2017-10-19 14:49:13 -05:00
Mike Place
866a78a673
Merge pull request #44176 from vernondcole/simplify-saltify
...
Simplify saltify cloud driver
2017-10-19 14:37:17 -05:00
twangboy
a862e0bf2d
Remove unneeded import
2017-10-19 13:30:16 -06:00
twangboy
d78f27466d
Fix unit.states.test_mount for Windows
...
Use `os.path.realpath` to convert paths
Mock `os.path.exists`
2017-10-19 13:30:16 -06:00
twangboy
64d2e4f732
Fix pickling errors on Windows
...
Moves the 4 sub functions to the global scope
2017-10-19 11:50:23 -06:00
Nicole Thomas
f0175623ed
Merge branch 'develop' into ssh_known_hosts_improvements
2017-10-19 13:44:29 -04:00
Vernon Cole
4c8cd9c507
lint and comment fixes
2017-10-19 10:16:28 -06:00
Daniel Wallace
ac0b5ec440
fix test
2017-10-19 09:28:59 -06:00
Vernon Cole
2b4f69e1f8
remove unused parameter
2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests
2017-10-18 20:06:14 -06:00
Benedikt Werner
4bfeb7f1d1
Fixed missing import
2017-10-19 03:17:16 +02:00
Gareth J. Greenaway
8bbb1088e8
Fixing lint.
2017-10-18 14:57:33 -07:00
Gareth J. Greenaway
1e312d1b59
Adding tests for _memdata, Linux & *BSD
2017-10-18 14:57:33 -07:00
Ch3LL
cd79e9444e
remove unneded kwarg
2017-10-18 17:21:52 -04:00
Ch3LL
1541376c4f
Add spm build test
2017-10-18 17:15:42 -04:00
twangboy
bb1d2eb85b
Skip tests that are failing on PAM eauth
2017-10-18 14:03:10 -06:00
rallytime
832aa3010c
Reorder and group imports in jina template unit tests
...
The imports were scattered around quite a bit, which made it hard
to see where multiple uses of salt/utils/* imports were being pulled
in.
This PR just adjusts the ordering so it's easier to see what is included
already for the future. (This is particularly useful for catching misuses
of salt.utils.__init__.py functions.)
2017-10-18 14:15:50 -04:00
kstreee
e210f12cb7
Fixes inconsistent exception handling in rest_tornado.
2017-10-19 02:22:23 +09:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow
2017-10-18 19:10:55 +02:00
Mike Place
990a454f99
Merge pull request #44153 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-10-18 10:51:14 -06:00
Nicole Thomas
255a20f0e7
Merge pull request #44123 from terminalmage/gitfs-singleton
...
Use one salt.utils.gitfs.GitFS instance per thread
2017-10-18 12:12:25 -04:00
rallytime
d712031a43
Update to_unicode util references to new stringutils path
2017-10-18 09:44:55 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/opkg.py
- salt/utils/templates.py
- tests/unit/templates/test_jinja.py
2017-10-18 09:37:47 -04:00
rallytime
0311c2a4de
Replace salt utils import with correct salt.utils.files path
...
This fixes a couple of test failures in the develop branch and cleans up
a couple of formatting issues and import ordering.
2017-10-17 17:55:18 -04:00
Mike Place
71f2bc4776
Merge branch 'develop' into panos-2017-9-26
2017-10-17 15:19:48 -06:00
Daniel Wallace
319b811f2f
exclude module name checker for kitchen helpers
2017-10-17 15:18:19 -06:00
Mike Place
afcaa0c591
Merge pull request #43913 from twangboy/win_fix_test_jinja
...
Fix `unit.templates.test_jinja` for Windows
2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1
Merge pull request #43917 from twangboy/win_unit_test_pillar
...
Fix `unit.test_pillar` for Windows
2017-10-17 15:06:45 -06:00
Daniel Wallace
5e47788756
move tests up a directory
2017-10-17 14:59:11 -06:00
Daniel Wallace
f55986c087
pylint
2017-10-17 14:59:11 -06:00
Daniel Wallace
2573a74ac1
environment variable logic
2017-10-17 14:59:11 -06:00
Daniel Wallace
37abb1d06a
working pytest run
2017-10-17 14:59:11 -06:00
Daniel Wallace
59beb39406
don't use junit-xml if xml path not set
2017-10-17 14:59:11 -06:00
Daniel Wallace
e4d497a293
should be self.env
2017-10-17 14:59:11 -06:00
Daniel Wallace
d6e48f7cde
limit wordpress tests to opensuse and centos
2017-10-17 14:59:11 -06:00
Daniel Wallace
869330d836
use log_level: warning
2017-10-17 14:59:11 -06:00
Daniel Wallace
5234f706c5
use_vt on DEBUG log level
2017-10-17 14:59:11 -06:00
Daniel Wallace
c35e413ec2
move destroy to tearDown
2017-10-17 14:59:11 -06:00
Daniel Wallace
e6432ee049
log junit for each suite and platform
2017-10-17 14:59:11 -06:00
Daniel Wallace
7410ffd92a
add first kitchen test
2017-10-17 14:59:10 -06:00
Daniel Wallace
b8c800e4a7
start adding kitchen to test suites
2017-10-17 14:59:10 -06:00
Mike Place
4809dd41c0
Merge branch 'develop' into gitfs-singleton
2017-10-17 14:16:28 -06:00
rallytime
74acaad46e
Refactor publish func in master/masterapi to use check_authentication
...
In a previous PR, the runner and wheel functions in master.py and masterapi.py
were refactored to reduce common code via the salt.auth.check_authentication
method.
The publish function also can utilize the check_authentication function in
master.py and masterapi.py.
Consolidation of this code will help us be able to differentiate between
authorization and authentication errors in the future.
2017-10-17 12:27:13 -04:00
Marc Koderer
c4d9684a90
Use correct mac prefix for kvm/qemu
...
Using the private mac range for vms makes it impossible to
distinguish between hypervisors.
Issues #44056
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
2017-10-17 10:46:06 +02:00
Gareth J. Greenaway
a89c26c88e
Various fixes to beacons to handle situations when beacons are stored in pillar. Updating execution module to report that beacons stored in pillar can not be managed via module. Updating add function to ensure beacon is available before attempting to add it. Updaitng unit tests to include new beacon is available check.
2017-10-16 14:32:12 -07:00
Matthew Summers
bebf301976
fixed test addressing issue #43307 , disk.format_ to disk.format
2017-10-16 16:35:57 -04:00
Erik Johnson
3e96225210
Use one salt.utils.gitfs.GitFS instance per thread
...
This reduces some of the overhead caused by many concurrent fileclient
requests from minions.
Additionally, initializing remotes has been folded into the GitBase
class' dunder init. Instantiating an instance and initializing its
remotes were initially split so that an object could simply be created
with the master opts so that the configuration was loaded and nothing
else, allowing for certain cases (like clearing the cache files) where
we didn't need to actually initialize the remotes. But this both A)
presents a problem when the instance being used is a singleton, as you
don't want to be re-initializing the remotes all the time, and B)
suppressing initialization can be (and is now being) done via a new
argument to the dunder init.
2017-10-16 15:25:29 -05:00
Nicole Thomas
68974aa74d
Merge pull request #44029 from msummers42/2017.7
...
addresses issue #43307 , disk.format_ to disk.format
2017-10-16 15:59:19 -04:00
rallytime
54c4be35ae
Update any moved utils references from the merge-forward
2017-10-16 15:47:32 -04:00
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop'
...
Conflicts:
- doc/topics/tutorials/index.rst
- salt/crypt.py
- salt/modules/cmdmod.py
- salt/modules/grains.py
- salt/pillar/git_pillar.py
- salt/roster/clustershell.py
- tests/unit/states/test_augeas.py
- tests/unit/utils/test_utils.py
2017-10-16 15:26:19 -04:00
Nicole Thomas
9fe94d7843
Merge pull request #44098 from twangboy/win_mock_test_parsers
...
Return multiprocessing queue in LogSetupMock class
2017-10-16 14:14:29 -04:00
twangboy
a4e2d8059d
Fix unit.templates.test_jinja for Windows
...
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
2017-10-16 10:41:36 -06:00
Matthew Summers
16e1c1dfc8
fixed test addressing issue #43307 , disk.format_ to disk.format
2017-10-16 09:47:40 -05:00
Erik Johnson
877abb89d0
Complete the salt.utils refactor
...
This moves the remaining 30 functions from salt.utils to new locations.
2017-10-15 09:43:31 -05:00
garethgreenaway
abf596bbd9
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-10-15 07:35:31 -07:00
twangboy
caf086c05a
Skip Master, Minion, and Syndic parser tests
2017-10-13 16:02:01 -06:00
twangboy
cc43ca27af
Return multiprocessing queue in LogSetupMock class
2017-10-13 15:47:19 -06:00
Gareth J. Greenaway
f06bb04348
Adding the right mocked data to the Windows test. Updating the grains/core.py to check if the entire line is alpha_numeric characters to determine if it should be skipped.
2017-10-13 10:01:58 -07:00
