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
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
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
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
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
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
twangboy
812c857770
Fix test_init for Windows
2017-02-16 16:00:45 -07:00
Mike Place
35566a8824
Merge pull request #39449 from cloudflare/port-38682
...
[Nitrogen] Port #38682
2017-02-16 15:51:11 -07:00
Mike Place
964c539cb8
Merge pull request #39466 from xlotlu/patch-1
...
grammar in states/top.rst
2017-02-16 15:48:52 -07:00
Ionuț Ciocîrlan
ebe2c3e83b
grammar in states/top.rst
2017-02-17 00:26:45 +02:00
Nicole Thomas
1577bb68af
Merge pull request #39459 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-02-16 14:30:31 -07:00
Mike Place
b17931a653
Merge pull request #39455 from UtahDave/develop
...
add Salt Enterprise photo
2017-02-16 12:39:20 -07:00
Mike Place
649e9f041f
Merge pull request #39453 from rallytime/remove-test-globals
...
Remove global dunder definitions from tests
2017-02-16 12:22:47 -07:00
rallytime
dda39d4e63
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/file.py
- salt/modules/grains.py
- salt/utils/gitfs.py
2017-02-16 12:18:46 -07:00
David Boucha
570e14250d
add Salt Enterprise photo
2017-02-16 11:50:28 -07:00
Megan Wilhite
1acf00da3b
add 2016.11.3 changelog to release notes ( #39451 )
2017-02-16 10:49:53 -07:00
rallytime
3a8bd786e0
Remove global dunder definistions from tests
...
These dunders are already being mocked appropriately below in the test, so we
don't need to define them in the test module's namespace.
The global definitions here were conflicting with the globals defined in
`saltmod_test.py`, and causing the following stacktrace in the test suite:
```
Traceback (most recent call last):
File "/root/SaltStack/salt/tests/unit/saltmod_test.py", line 71, in test_state
self.assertDictEqual(saltmod.state(name, tgt, highstate=True), test_ret)
File "/root/SaltStack/salt/salt/states/saltmod.py", line 252, in state
masterless = __opts__['__role'] == 'minion' and \
KeyError: '__role'
```
2017-02-16 10:33:32 -07:00
Mike Place
8e2cbd2307
Merge pull request #39448 from gtmanfred/2016.11
...
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:29:47 -07:00
Mike Place
388d3c2fad
Merge pull request #39435 from mchugh19/develop
...
Have mysql state error out on non-existant file
2017-02-16 10:04:12 -07:00
Mike Place
d63539b44f
Merge pull request #39436 from ari/patch-1
...
Improve introduction to explain the purpose of orchestration
2017-02-16 10:02:51 -07:00
Mike Place
091b233fe6
Merge pull request #39442 from cloudflare/napalm_host_grain
...
Enhance NAPALM grains
2017-02-16 09:51:01 -07:00
Mircea Ulinic
d26c1c2c9d
Port f847639dee into Nitrogen
2017-02-16 16:19:31 +00:00
Daniel Wallace
3172e88700
Add release notes for cisco proxy minions added in Carbon
2017-02-16 10:05:33 -06:00
Mike Place
8723caa710
Merge pull request #39443 from cloudflare/napalm_keepalive
...
NAPALM proxy: add alive function for proxy keepalive
2017-02-16 08:28:35 -07:00
Mircea Ulinic
882bdd9697
NAPALM proxy: add alive function for proxy keepalive
2017-02-16 13:24:26 +00:00
Mircea Ulinic
f778ecc1be
Enhance NAPALM grains
2017-02-16 12:44:42 +00:00
Ari Maniatis
4af0514def
Improve introduction to explain the purpose of orchestration
...
Before diving into technical details tell the user why they want this feature.
2017-02-16 18:52:05 +11:00
