Mike Place
83f1bcc4f0
Merge branch 'develop' into zh_1374
2018-07-18 17:17:11 -06:00
Ch3LL
3727d1b3b9
switch try/except to match 2018.3
2018-07-18 18:05:17 -04:00
Ch3LL
fb953c2369
[2017.7] Fix service.disabled test for macosx
2018-07-18 17:58:44 -04:00
Mike Place
fedb65d393
Merge branch 'develop' into sdb
2018-07-18 15:43:49 -06:00
Ch3LL
2bfaf7fe89
Fix service.disabled test for macosx
2018-07-18 17:43:24 -04:00
Mike Place
f590eb2b02
Update state.py
2018-07-18 15:37:06 -06:00
Mike Place
9874429741
Merge pull request #48628 from terminalmage/testinfra
...
Fix NameError in testinfra module
2018-07-18 15:34:02 -06:00
Andrey Tuzhilin
e23a080226
+ imports fix
2018-07-19 00:03:18 +03:00
Andrey Tuzhilin
bf290dbfef
+ tests + docs
2018-07-19 00:01:33 +03:00
Ch3LL
90c3f568b1
Add windows ip module integration tests
2018-07-18 13:58:17 -04:00
Daniel Wallace
2c2f790e07
Merge pull request #48652 from gtmanfred/pylint-develop
...
[develop] handle pyzmq for python3.4
2018-07-18 12:34:44 -05:00
Daniel Wallace
0d4c80205f
Merge pull request #48651 from gtmanfred/pylint-2017.7
...
[2017.7] handle pyzmq for python3.4
2018-07-18 12:34:41 -05:00
Daniel Wallace
e828167114
Merge pull request #48650 from gtmanfred/pylint-2018.3
...
[2018.3] handle pyzmq for python3.4
2018-07-18 12:34:37 -05:00
Erik Johnson
9515dd17ff
docker_container.running: Fix regression in test mode
...
In the process of overhauling docker_container.running to support
network management for 2018.3.0, This line was deleted when it should
not have been. Adding it back to ensure we exit the state at the proper
place when state is run in test mode.
2018-07-18 12:21:03 -05:00
Daniel Wallace
f99283751f
handle pyzmq for python3.4
2018-07-18 12:16:05 -05:00
Daniel Wallace
3c1882077e
handle pyzmq for python3.4
2018-07-18 12:15:55 -05:00
Daniel Wallace
b6ee52f859
handle pyzmq for python3.4
2018-07-18 12:15:23 -05:00
Daniel Wallace
269c521cef
Merge pull request #48649 from gtmanfred/pylint-develop
...
[develop] disable checks on pylint
2018-07-18 11:21:48 -05:00
Daniel Wallace
a6f8acf4dc
Merge pull request #48648 from gtmanfred/pylint-2018.3
...
[2018.3] disable checks on pylint
2018-07-18 11:21:36 -05:00
Daniel Wallace
160ae29cf2
Merge pull request #48647 from gtmanfred/pylint-2017.7
...
[2017.7] disable checks on pylint
2018-07-18 11:21:22 -05:00
Daniel Wallace
ff818c4ca2
disable checks on pylint
2018-07-18 11:13:13 -05:00
Daniel Wallace
bf3965632a
disable checks on pylint
2018-07-18 11:12:43 -05:00
Daniel Wallace
7c34c2965e
disable checks on pylint
2018-07-18 11:12:30 -05:00
Alexandru Vasiu
73f533e4c7
modules/nilrt_ip.py: Fix configparser compatibility
...
read_file is available only since python 3.2 so readfp should
be used instead
Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>
2018-07-18 18:12:24 +03:00
Alexandru Vasiu
8c9dfb376f
modules/nilrt_ip.py: Add EtherCAT Support
...
The possibilities for adapter mode are: TCP/IP, EhterCAT and
Disabled.
Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>
Signed-off-by: Ovidiu-Adrian Vancea <ovidiu.vancea@ni.com>
2018-07-18 18:12:15 +03:00
Nicolas Braud-Santoni
3673bae9de
modules/acme: explicitely ignore the perms return value
2018-07-18 09:19:30 +02:00
twangboy
e30d17099d
Use goto instead of if statement
2018-07-17 18:23:34 -06:00
Jamie Bliss
1800a231e8
Fixup some schema expectations
2018-07-17 18:44:52 -04:00
twangboy
e1042fa084
Remove vcredist for Py3
2018-07-17 16:28:01 -06:00
Nicolas Braud-Santoni
8c718cb417
acme: Make the private key mode configurable
2018-07-17 23:51:35 +02:00
Jamie Bliss
917dea6761
modules/acme: Use file.check_perms ret-morphing powers
...
As a bonus, the return value now indicates whether permissions where changed.
2018-07-17 23:51:21 +02:00
Nicolas Braud-Santoni
d2241ceb2d
module/acme: Do not exit early when the certificate already exists
...
Otherwise, acme.cert might fail to cert permissions on the certificate.
Close #48626
2018-07-17 23:51:21 +02:00
Nicolas Braud-Santoni
98af0db826
modules/acme: Set the private key filemode to 0640
...
Closes #48627
2018-07-17 23:51:21 +02:00
Daniel Wallace
70c57e61b7
mark vault tests as flaky
...
The first couple commands to vault seem to be failing sometimes, but
after that this all works.
2018-07-17 16:30:37 -05:00
Erik Johnson
47b1032efa
Merge pull request #48593 from pritambaral/fix/2017.7-importlib-pyc-loading-order
...
Fix importlib pyc loading order
2018-07-17 16:06:27 -05:00
Daniel Wozniak
01c9c59a97
Merge pull request #48634 from dwoz/state-module-test-fix
...
Sync modules for state tests
2018-07-17 13:33:05 -07:00
twangboy
8ef022de04
Fix lint issues
...
Import ctypes instead of from ctypes import *
2018-07-17 14:27:17 -06:00
Daniel Wallace
9da7b2ec8d
Merge pull request #48630 from dubb-b/pipeline-updates
...
Adding options to Jenkins pipline builds
2018-07-17 15:16:22 -05:00
Brett Benassi
8594a8dd05
Adding PY_COLORS=1 as PY_COLORS = 1 instead
2018-07-17 13:57:00 -06:00
Brett Benassi
314b0e3599
Adding PY_COLORS=1 for python programs to use ANSI Colors
2018-07-17 13:54:11 -06:00
Daniel A Wozniak
9dfd2ae392
Sync modules for state tests
2018-07-17 19:00:18 +00:00
Daniel Wallace
a8ae2adf64
Merge pull request #48633 from saltstack/revert-48610-2017.7
...
Revert "only run pylint on files that change"
2018-07-17 13:44:02 -05:00
Daniel Wallace
bab4a769d4
Revert "only run pylint on files that change"
2018-07-17 13:43:12 -05:00
Daniel Wallace
9d11cc189a
[RFC] add rfc for loader changes in Fluorine
2018-07-17 13:32:08 -05:00
Brett Benassi
b705e8f7a5
Adding correct spacing to options section
2018-07-17 12:26:37 -06:00
Brett Benassi
9d8a7e07db
Adding options to Jenkins pipline builds
2018-07-17 12:21:19 -06:00
Daniel Wallace
f941ea265f
add running sdb tests
2018-07-17 13:06:15 -05:00
Daniel Wallace
962b3612b0
fix sdb test for vault
2018-07-17 13:04:04 -05:00
Erik Johnson
5ace9f01ec
Fix NameError in testinfra module
2018-07-17 12:38:17 -05:00
Ch3LL
9790ee3d0d
Follow up to PR #48555
2018-07-17 12:18:50 -04:00
