Commit Graph

89566 Commits

Author SHA1 Message Date
Erik Johnson
42d2b1d719
Python 3 doesn't have 'u' before unicode strings 2018-01-13 21:08:51 -06:00
Erik Johnson
9134f662cc
Update tests to reflect unicode minion IDs in outputters 2018-01-13 21:08:51 -06:00
Erik Johnson
685bfbbd3e
[PY3] Add unicode_literals to cache and cli modules 2018-01-13 21:08:51 -06:00
Nicole Thomas
dcac4d4ce9
Merge pull request #45423 from terminalmage/py3-salt.utils-a-d
[PY3] Add unicode_literals to salt.utils modules (A-D)
2018-01-13 20:33:28 -05:00
Gareth J. Greenaway
4a5e7ce3d8
Merge pull request #45436 from terminalmage/fix-iam-breakage
Fix breakage in salt.utils.iam
2018-01-13 15:42:05 -08:00
Erik Johnson
1044b627a1
[PY3] Add unicode_literals to salt.utils modules (A-D) 2018-01-13 16:08:56 -06:00
Erik Johnson
c57b5a5502
Fix breakage in salt.utils.iam
This fixes breakage introduced in
https://github.com/saltstack/salt/pull/45406 and adds a unit test.
2018-01-13 15:04:18 -06:00
Nicole Thomas
a6366c9ff1
Merge pull request #45425 from twangboy/win_fix_swarm
Fix stack trace on machines without docker
2018-01-13 14:43:54 -05:00
Nicole Thomas
bb71b10f77
Merge pull request #45427 from twangboy/win_fix_test_local_cache
Fix `unit.returners.test_local_cache` for Windows
2018-01-13 14:36:50 -05:00
twangboy
e137775c1f
Fix race condition in Windows with the creation time 2018-01-12 16:22:35 -07:00
twangboy
6dac045148
Use if HAS_DOCKER in __init__ 2018-01-12 15:15:50 -07:00
Nicole Thomas
b7956edb18
Merge pull request #45415 from Ch3LL/change-rackspace
Change rackspace provider name for >=oxygen cloud tests
2018-01-12 17:02:18 -05:00
twangboy
9289193205
Fix stack trace on machines without docker 2018-01-12 14:38:58 -07:00
Nicole Thomas
0c58cb77ac
Merge pull request #45406 from garethgreenaway/oxygen_updating_utils_for_unicode_round_two
[oxygen] Oxygen updating utils and related tests for Unicode round two
2018-01-12 14:07:47 -05:00
Nicole Thomas
1755af821d
Merge pull request #44866 from DSRCorporation/slots3
Slots: use execution function return as a state arg value
2018-01-12 13:58:16 -05:00
Nicole Thomas
c59bb33c89
Merge pull request #45354 from terminalmage/issue45352
Fix warnings when default config values are set to None
2018-01-12 12:45:08 -05:00
Ch3LL
62035a04ff
update provider rackspace config 2018-01-12 12:02:01 -05:00
Gareth J. Greenaway
58d0dfe917
Fixing lint in listdiffer.py and reverting a change in jinja.py 2018-01-12 08:42:39 -08:00
Gareth J. Greenaway
0e44911d77
Updating various tests for Unicode goodness 2018-01-12 08:42:39 -08:00
Gareth J. Greenaway
9ee5b417f7
Updating various utils for Unicode goodness 2018-01-12 08:42:39 -08:00
Ch3LL
40677cad21
migrate rackspace to openstack in cloud test 2018-01-12 11:08:28 -05:00
Nicole Thomas
04b8e1cafc
Merge pull request #45401 from gtmanfred/oxygen
fix boto import failures
2018-01-12 10:55:48 -05:00
Ch3LL
f7cf8b6e94
Change rackspace provider name for >=oxygen cloud tests 2018-01-12 10:55:31 -05:00
Nicole Thomas
6f8f477fa3
Merge pull request #45400 from terminalmage/fix-coregrains
Fix traceback in core grains on Ubuntu 14
2018-01-12 09:54:05 -05:00
Nicole Thomas
7fa3df48ac
Merge pull request #45404 from twangboy/win_fix_test_vagrant
Fix `unit.modules.test_vagrant` for Windows
2018-01-12 09:53:12 -05:00
Nicole Thomas
932ca0b33a
Merge pull request #45403 from terminalmage/windows-encode-decode-fallbacks
Fall back to utf-8 when to_str/to_unicode/to_bytes fail to encode/decode
2018-01-12 09:49:35 -05:00
Nicole Thomas
b3b8e26b34
Merge pull request #45410 from s0undt3ch/oxygen
Stop using the depracated `salt.utils.get_user()` function.
2018-01-12 09:48:03 -05:00
Pedro Algarvio
5cee46ec41
Stop using the depracated salt.utils.get_user() function. 2018-01-12 10:33:31 +00:00
Daniel Wallace
c378c356eb
fix moto version
Fixes saltstack/salt-jenkins#692
2018-01-11 17:42:59 -07:00
twangboy
df64c60530
Remove hard-coded, linux-style paths 2018-01-11 23:24:46 +00:00
Erik Johnson
6fbe368b71
Fall back to utf-8 on windows when to_str/to_unicode/to_bytes fail to encode/decode 2018-01-11 16:49:03 -06:00
Daniel Wallace
fdcf71a10c
fix test boto imports
Test boto imports are failing for some reason
2018-01-11 15:14:25 -07:00
Erik Johnson
8cb442af5f
Fix traceback in core grains on Ubuntu 14
It turns out that six.b() is a damn dirty liar on Python 2 and doesn't
always produce a str() type.
2018-01-11 15:43:40 -06:00
Nicole Thomas
0e6cf84f65
Merge pull request #45392 from gtmanfred/oxygen
Disable discovery in test suite
2018-01-11 16:14:19 -05:00
Daniel Wallace
065ae4e61f
increase timeout for starting daemons 2018-01-11 10:45:47 -07:00
Daniel Wallace
3cb91b4d63
disable discovery in test suite 2018-01-11 09:58:14 -07:00
Nicole Thomas
223470519d
Merge pull request #44830 from terminalmage/issue40776
Implement variable fileserver update intervals
2018-01-11 09:10:36 -05:00
Dmitry Kuzmenko
c205c10e89
Added Slots release note. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
3bc17b4fb4
Avoid unicode args issue. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
fe87704ff2
Slots: @terminalmage code review fixes. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
535024f03a
Slots: minor fixes. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
b55bba0d46
Slots documentation. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
f40cb3f2f1
Slots: bugfixes and tests. 2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko
9782b4e9a8
Working slots concept for execution modules. 2018-01-11 14:05:57 +03:00
Thomas S Hatch
deaa1dccc9
start work on slots... again 2018-01-11 14:05:57 +03:00
Nicole Thomas
a37f7d7cd4
Merge pull request #45377 from terminalmage/py3-log-grains
[PY3] add unicode_literals to log/grains modules
2018-01-10 15:14:23 -05:00
Erik Johnson
f900715e1c
[PY3] add unicode_literals to log/grains modules 2018-01-10 11:37:59 -06:00
Nicole Thomas
54dc7b76e5
Merge pull request #45340 from twangboy/win_fix_test_beacons
Fix `unit.modules.test_beacons` for Windows
2018-01-10 12:10:52 -05:00
Erik Johnson
ccfa24260d
Fix warnings when default config values are set to None 2018-01-10 09:42:20 -06:00
Nicole Thomas
32806d00b3
Merge pull request #45308 from twangboy/win_fix_test_state
Fix `integration.modules.test_state` for Windows
2018-01-10 09:38:25 -05:00