Pedro Algarvio
39565a67a3
Only try to encode bytes
2017-02-17 20:48:57 +00:00
Pedro Algarvio
ac7c99f628
We need to write as bytes under Py3 since the file was opened in binary mode
2017-02-17 20:48:57 +00:00
Pedro Algarvio
7a0576b3fd
multiprocessing.Array expects bytes under Python 3.
2017-02-17 20:48:57 +00:00
Pedro Algarvio
64867e234b
Write binary data in binary mode. Make sure msgpack separates bytes from encoded strings
2017-02-17 20:48:57 +00:00
Pedro Algarvio
20882bfcb4
These tests require root for default paths and create directories if non existing
2017-02-17 20:48:57 +00:00
Pedro Algarvio
a8e32cf076
**kwargs ordering is different under Py3
2017-02-17 20:48:56 +00:00
Pedro Algarvio
f921c1e131
Sort before asserting since the order changes between py2 and py3
2017-02-17 20:48:56 +00:00
Pedro Algarvio
9503045b05
Use tempfile.gettempdir() since that depends on current user and distro setup
2017-02-17 20:48:56 +00:00
Pedro Algarvio
33d8832e40
Assert different outcome under Py3
2017-02-17 20:48:56 +00:00
Pedro Algarvio
90adbe925f
Force dictionary order
2017-02-17 20:48:56 +00:00
Pedro Algarvio
9b2d79317a
Handle different test outcome under Py3
2017-02-17 20:48:55 +00:00
Pedro Algarvio
d32277c699
Only try to decode bytes
2017-02-17 20:48:55 +00:00
Pedro Algarvio
1d060096e3
Force ordering under Py3
2017-02-17 20:48:55 +00:00
Pedro Algarvio
04b4d0947e
Disable tests on Py3.
...
The order of attributes is sketchy under Py3 and this code will be
deprecated.
2017-02-17 20:48:55 +00:00
Pedro Algarvio
c093d97a93
Only run the ascii case on Py2
2017-02-17 20:48:55 +00:00
Pedro Algarvio
3d1c4ce126
We can't sort incomparable types in Py3 like integers and strings
...
```
Python 2.7.13 (default, Dec 21 2016, 07:16:46)
[GCC 6.2.1 20160830] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> sorted({1: 2, 3: {4: 5}, '*OS': 'B'})
[1, 3, '*OS']
>>>
```
```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> sorted({1: 2, 3: {4: 5}, '*OS': 'B'})
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
TypeError: unorderable types: str() < int()
>>>
```
We could also cast to strings any non string keys, however:
```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> sorted([str(k) for k in {1: 2, 3: {4: 5}, '*OS': 'B'}])
['*OS', '1', '3']
>>>
```
The order does not match the order on Py2.
Additionally, I see no justification as to why we need to sort these keys.
@vutny Any reason why we need the dictionary keys sorted?
2017-02-17 20:48:52 +00:00
Pedro Algarvio
86f3d6f1b0
No need to handle separately(which broken in Py3). Just handle Py3 str->bytes
2017-02-17 20:47:55 +00:00
Pedro Algarvio
20a4d7bb39
Under Py3, stat.S_ISLNK() expects an integer. Mock it.
2017-02-17 20:47:55 +00:00
Pedro Algarvio
a1fdd471b2
Just import the top-level six package and not attributes of it
2017-02-17 20:47:55 +00:00
Pedro Algarvio
622e87dfb5
Py3 compatibility fix
2017-02-17 20:47:55 +00:00
Pedro Algarvio
efa6432d84
Fix scoping issues with exc
2017-02-17 20:47:54 +00:00
Pedro Algarvio
958a7f6543
Py3 compatibility for salt.modules.ini_manage
2017-02-17 20:47:54 +00:00
Pedro Algarvio
ddc958907e
Fix aliases integration module test under Py3
2017-02-17 20:47:54 +00:00
Pedro Algarvio
39f9bf5915
Apply same solution as in roots and gitfs.
...
These are blind fixes since we don't have test coverage but should just
work.
2017-02-17 20:47:54 +00:00
Christian McHugh
b7d0968f55
Add generic zabbix query_run
2017-02-17 20:35:32 +00:00
Mike Place
bf68f9c73c
Merge pull request #39404 from Mac21/add-subnets-cloud-gce
...
Add subnetwork support to GCE Cloud Module.
2017-02-17 11:40:46 -07:00
Mike Place
87b269fc80
Merge pull request #39418 from alprs/fix-aptpkg_info_nonexistent_pkg
...
Allow aptpkg.info_installed on package names that aren't installed
2017-02-17 11:34:18 -07:00
Mike Place
e816d6c23e
Merge pull request #39438 from cloudflare/fix_39422
...
file.get_managed: refetch source when file hashsum is changed
2017-02-17 10:58:28 -07:00
Mike Place
a5fe8f0fa6
Merge pull request #39432 from dmaziuk/issue39203
...
Quick and dirty fix for GECOS fields with more than 3 commas
2017-02-17 10:57:30 -07:00
Mike Place
3665229a5a
Merge pull request #39484 from corywright/fix-reactor-docs-pillar-keyword-args
...
The Reactor docs should use pillar='{}' instead of 'pillar={}'
2017-02-17 10:50:57 -07:00
twangboy
1328055c4d
Remove orphaned function list_configurable_policies
2017-02-17 10:37:12 -07:00
Mike Place
040d962fd3
Merge pull request #39476 from cetanu/patch-1
...
fix OrderedDict being passed into _get_size_spec
2017-02-17 10:13:33 -07:00
Cory Wright
cc90d0d53f
The Reactor docs should use pillar='{}' instead of 'pillar={}'
2017-02-17 11:07:39 -06:00
Mike Place
2d1636ec82
Merge pull request #39477 from SolarisYan/contribute_salt
...
here should be 'Error' in info
2017-02-17 10:03:42 -07:00
Mike Place
0c26f33c5d
Merge pull request #39478 from Unity-Technologies/hotfix/salt-cloud-vsphere-disk-dev
...
Don't add a disk if it's None to the device specs
2017-02-17 10:02:26 -07:00
Mike Place
e85eff4865
Merge pull request #39468 from twangboy/win_git_test_init
...
Fix test_init for Windows
2017-02-17 09:57:12 -07:00
Mike Place
b2b77f55f7
Merge pull request #39481 from NavidZisky/patch-1
...
Change error to warning for DBUS
2017-02-17 09:55:04 -07:00
toller
3ab83e5d94
Fix documentation about deleting subnetwork and network when recources are using them.
2017-02-17 09:53:03 -07:00
toller
e1d4041905
Fix bug with create_network cidr and mode params.
2017-02-17 09:52:44 -07:00
David Zisky
9dce2da5ca
Change error to warning for DBUS
...
When DBUS is not running it's not necessary to mark is as error since You can easily run salt without it. Logging it as error makes only unnecessary log mess.
2017-02-17 11:50:53 +01:00
Daniel Hobley
4eaacbd339
Don't add a disk if it's None to the device specs
2017-02-17 10:46:27 +01:00
Andreas Lutro
246bf1e938
add failhard argument to various apt pkg functions
...
currently, it's not possible to query for info on packages that may not
be installed. with an added failhard argument, the user can specify if
they just want an empty result set back instead of an exception being
raised.
2017-02-17 10:06:26 +01:00
yangang
d794f2182e
here should be 'Error' in info
2017-02-17 16:04:00 +08:00
Vasili Syrakis
93cb6117fc
fix OrderedDict being passed into _get_size_spec
2017-02-17 16:27:35 +11:00
Vasili Syrakis
616633c9bf
OrderedDict being passed into _get_size_spec
2017-02-17 16:20:02 +11:00
twangboy
167cdb3447
Gate windows specific imports, add __virtual__
2017-02-16 17:50:47 -07:00
Mike Place
3fc1e2c9f8
Merge pull request #39372 from twangboy/gate_win_utils_dev
...
Gate the win_dacl util
2017-02-16 16:54:33 -07:00
Vasili Syrakis
6d6095e51e
str.split takes no keyword arguments in python 2.7
2017-02-17 10:29:52 +11:00
Vasili Syrakis
cd1cf1fb02
fix PR#39410
...
if opts['name'] doesn't contain a .DOMAIN.TLD, this will fail to unpack 2 values
2017-02-17 10:23:18 +11:00
twangboy
812c857770
Fix test_init for Windows
2017-02-16 16:00:45 -07:00
