Commit Graph

14182 Commits

Author SHA1 Message Date
twangboy
01f9beb5a9
Fix failing lgpo netsh tests 2018-12-19 22:35:17 -07: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
bcf8f06aa4
fixing lint 2018-12-18 16:48:14 -08:00
Gareth J. Greenaway
543ec7bc79
Ensure source_hash returned from get_source_sum is lowercase. 2018-12-18 16:51:26 -07:00
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