Commit Graph

85632 Commits

Author SHA1 Message Date
Mike Place
805ed1c964
Merge pull request #46879 from dwoz/cloudtestfix
Fix multiple typos causing tests to fail
2018-04-05 08:59:28 -05:00
Nicole Thomas
18e460fc30
Merge branch '2017.7' into whitelisted_acl 2018-04-04 17:28:40 -04:00
Daniel A. Wozniak
dc54fc53c3
Fix multiple typos causing tests to fail 2018-04-04 14:20:51 -07:00
Nicole Thomas
f70f6de282
Merge pull request #46647 from twangboy/win_fix_test_grains
Fix the tear down function in integration.modules.test_grains
2018-04-04 17:14:05 -04:00
Nicole Thomas
91c078ce12
Merge pull request #46756 from nages13/bugfix-grain-virtual_subtype
fix grains['virtual_subtype'] to show Docker on xen kernels
2018-04-04 16:53:49 -04:00
Nicole Thomas
058bbed221
Merge pull request #46799 from garethgreenaway/46762_prereq_shenanigans_tests
[2017.7] Adding test for PR #46788
2018-04-04 16:41:22 -04:00
Daniel Wallace
637cdc6b7b
fix pylint 2018-04-04 14:37:04 -05:00
Nageswar
781f5030a4
Merge branch 'bugfix-grain-virtual_subtype' of https://github.com/nages13/salt into bugfix-grain-virtual_subtype 2018-04-04 19:12:00 +00:00
Nageswar
7e704c0e81
Moved down container check code below hypervisors to validate containers type running in virtual environment.
Fixes #46754 & #43405
2018-04-04 19:09:05 +00:00
Daniel Wallace
b9efec8526
remove libnacl on windows
We do not use raet on windows, so we don't need to install it
2018-04-04 13:37:40 -05:00
Daniel Wallace
2edd5eaf9e
fix path 2018-04-04 13:37:39 -05:00
Daniel Wallace
b03e272e44
windows work 2018-04-04 13:37:39 -05:00
Nageswar
cd1ac4b7f9
Merge branch '2017.7' into bugfix-grain-virtual_subtype 2018-04-05 00:03:25 +05:30
Nicole Thomas
d9770bf3f8
Merge pull request #46867 from terminalmage/unicode-logging-normalization
Backport string arg normalization to 2017.7 branch
2018-04-04 14:06:56 -04:00
Nicole Thomas
9eb98b1f6e
Merge pull request #46770 from twangboy/fix_46433
Change the order of SID Lookup
2018-04-04 13:33:09 -04:00
Erik Johnson
7652688e83
Backport string arg normalization to 2017.7 branch
Prior to 2018.3 we were normalizing the format string to unicode but not
the args. This means that even when a non-unicode format string was
used, a str argument containing utf8-encoded non-ascii chars would result
in a traceback.

This backports the arg normalization from 2018.3 to to 2017.7 to ensure
that these sort of cases do not cause errors in logging.
2018-04-04 09:25:38 -05:00
Nicole Thomas
9c776cffb7
Merge pull request #46839 from gtmanfred/tupletarget
match tuple for targets as well
2018-04-04 10:07:11 -04:00
Nageswar
0ace76c0e7
Merge branch '2017.7' into bugfix-grain-virtual_subtype 2018-04-04 12:23:35 +05:30
Daniel Wallace
0151013ddb
document cli option for cmd_subset
It would be really nice to have a better name for `cmd_cli` in a future
release, possibly cmd_gen.  I don't feel comfortable making this change in
2017.7 though
2018-04-03 15:13:00 -05:00
Daniel Wallace
4a3ed6607d
add test for subset in orchestration 2018-04-03 15:13:00 -05:00
Daniel Wallace
3112359dd6
fix salt subset in orchestrator 2018-04-03 15:13:00 -05:00
Nicole Thomas
7db251dc11
Merge pull request #46845 from rallytime/bp-46817
Back-port #46817 to 2017.7
2018-04-03 15:52:28 -04:00
Nicole Thomas
e3d17ab7bc
Merge pull request #46847 from dwoz/missing-strdup
strdup from libc is not available on windows
2018-04-03 15:51:31 -04:00
Nicole Thomas
89af0a6222
Merge branch '2017.7' into fix_46433 2018-04-03 15:47:59 -04:00
Nicole Thomas
9eb6f5c0d0
Merge branch '2017.7' into bugfix-grain-virtual_subtype 2018-04-03 15:39:43 -04:00
Gareth J. Greenaway
13875e78cf
Fixing documention string for test. 2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
3d288c44d4
Fixing test documentation 2018-04-03 12:37:49 -07:00
Gareth J. Greenaway
6cff02ef6a
Adding tests for #46788 2018-04-03 12:37:49 -07:00
Daniel A. Wozniak
55845f4846
strdup from libc is not available on windows 2018-04-03 11:01:02 -07:00
Matt Phillips
36a0f6d8ca
address filehandle/event leak in async run_job invocations
extending on the idea used in #32145, when _check_pub_data is called it it will
create jid subscriptions, regardless of whether anyone will ever come back to
retrieve them; in the case of local_async calls noone ever does.
In addition to the above, we use the listen kwarg provided by c59a5adb0d to
know whether we need to subscribe to events in addition to ensuring the ioloop
is listening before a call is made.
This should fix #40245, #20639, #36374
2018-04-03 13:42:45 -04:00
Nicole Thomas
f2dd79f9c4
Merge pull request #46776 from gtmanfred/2017.7
fix shrinking list in for loop bug
2018-04-03 13:32:15 -04:00
Nicole Thomas
1941426218
Merge pull request #46838 from gtmanfred/npm
use http registry for npm
2018-04-03 13:02:31 -04:00
Nicole Thomas
e544254e7b
Merge pull request #46823 from rallytime/fix-42312
Improve __virtual__ checks in sensehat module
2018-04-03 12:56:08 -04:00
Nicole Thomas
37f6d2de35
Merge pull request #46641 from skizunov/develop3
Make LazyLoader thread safe
2018-04-03 12:09:16 -04:00
Daniel Wallace
3b7208ce27
match tuple for targets as well
Fixes #46826
2018-04-03 09:56:27 -05:00
Nicole Thomas
989508b100
Merge pull request #46837 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2018-04-03 10:54:10 -04:00
rallytime
8522c1d634
Merge branch '2016.11' into '2017.7'
Conflicts:
  - doc/conf.py
2018-04-03 10:51:59 -04:00
Daniel Wallace
bff61dd291
use http registry for npm
Older versions of npm can't validate the newer certificate.

We don't really need to worry about this, and it would be better to just make
sure the tests run correctly that to use https for the tests.
2018-04-03 09:44:48 -05:00
Megan Wilhite
307e7f35f9
Merge pull request #46740 from rallytime/2017.7_update_version_doc
Update release versions for the 2017.7 branch
2018-04-03 10:36:06 -04:00
Megan Wilhite
3e844ed1df
Merge pull request #46739 from rallytime/2016.11_update_version_doc
Update release versions for the 2016.11 branch
2018-04-03 10:29:07 -04:00
Nicole Thomas
ebf5dd276f
Merge pull request #46783 from twangboy/fix_46680
Fix network.managed test=True on Windows
2018-04-03 08:54:55 -04:00
Nicole Thomas
f652f25cc1
Merge pull request #46821 from rallytime/fix-mantest-failures
Fix the new test failures from the mantest changes
2018-04-03 08:40:50 -04:00
Nicole Thomas
c460f62081
Merge pull request #46800 from lomeroe/2017_7-46627
fix win_lgpo to correctly create valuenames of list item types
2018-04-03 08:38:44 -04:00
Nicole Thomas
df26f2641e
Merge pull request #46675 from dwoz/inspectlib-tests
Skip test when git symlinks are not configured
2018-04-03 08:19:18 -04:00
twangboy
da5ce25ef3
Fix unit tests on Linux 2018-04-02 19:59:13 -06:00
rallytime
dafa820f93
Improve __virtual__ checks in sensehat module
If the `sense_hat` python library is installed on the Raspberry Pi, but the
Pi doesn't actually have a SenseHat available, the execution module will
stacktrace when it's loaded:

```
root@raspberrypi:/home/pi# salt-call --local sys.doc none
[ERROR   ] Failed to import module sensehat, this is due most likely to a syntax error:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/loader.py", line 1411, in _load_module
    mod = imp.load_module(mod_namespace, fn_, fpath, desc)
  File "/usr/lib/python2.7/dist-packages/salt/modules/sensehat.py", line 26, in <module>
    _sensehat = SenseHat()
  File "/usr/lib/python2.7/dist-packages/sense_hat/sense_hat.py", line 36, in __init__
    raise OSError('Cannot detect %s device' % self.SENSE_HAT_FB_NAME)
OSError: Cannot detect RPi-Sense FB device
local:
    ----------
```

We need to catch the OSError and warn people that this module needs a SenseHat
available to the Pi to work.

This PR catches that OSError in the `__virtual__()` and displays a helpful message to
the user.

This change also helps distinguish the errors of when the `sense_hat` python lib is
missing vs the actual SenseHat missing.
2018-04-02 16:55:15 -04:00
rallytime
209a8029c3
Fix the new test failures from the mantest changes
The changes in #46778 introduced a couple of test failures into the 2017.7 branch.

This PR cleans up some of the references causing failures on 3 new test failures.
The failures are due to the new reference of the `mantest` module, which is only
used for testing here, and not an actual module in salt to test docs and the
saltutil module against.
2018-04-02 16:06:50 -04:00
Nicole Thomas
4083e7c460
Merge pull request #46815 from terminalmage/bp-46809
Backport #46809 to 2017.7
2018-04-02 16:05:14 -04:00
rallytime
7edf98d224
Update 2018.3.0 information and move branch from "latest" to "previous" 2018-04-02 15:05:36 -04:00
Nicole Thomas
3bac9717f4
Merge pull request #46769 from dwoz/wincloudtest
Adding windows minion tests for salt cloud
2018-04-02 14:51:48 -04:00