Pedro Algarvio
07167422ba
Also test pattern
2015-07-02 10:08:08 +01:00
Pedro Algarvio
4d4e94b59c
Unit tests for salt.utils.config
2015-07-01 18:18:31 +01:00
Justin Findlay
1753234bab
Merge pull request #24615 from msteed/py3-unittests-5
...
py3 unittest compat
2015-06-16 09:25:19 -06:00
Michael Steed
0a5725a67c
no-op
2015-06-15 17:08:43 -06:00
Gareth J. Greenaway
d68cd6f646
fixing unit tests related to schedule jobs in pillar.
2015-06-13 08:49:26 -07:00
Colton Myers
21d9df2831
Merge pull request #24606 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-06-11 16:57:11 -06:00
Nicole Thomas
22c44490b0
Merge pull request #24602 from msteed/py3-fix-ascii-arch
...
Undo the memoization of contrived locale
2015-06-11 13:55:37 -06:00
Colton Myers
725e5c689f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
2015-06-11 13:15:38 -06:00
Michael Steed
91aeaabb7c
undo the memoization of contrived locale
2015-06-11 12:13:07 -06:00
Mike Place
39ef4f3209
Merge pull request #24584 from cachedout/unit_warnings
...
Fix unit test warnings
2015-06-11 20:47:59 +05:30
Thomas S Hatch
d3feedd174
Merge pull request #24557 from msteed/py3-unittests-4
...
More py3 unittest fixes
2015-06-10 20:14:14 -06:00
Mike Place
7e153bc6a9
Fix unit test warnings
2015-06-10 15:37:01 -06:00
rallytime
c82f135d2e
Disabled some flaky tests until we can figure out how to make them more reliable
2015-06-10 14:04:14 -06:00
Michael Steed
63531c2a3d
fix failing unit test
...
Reload the locales module to discard the memoization of get_encodings()
2015-06-10 10:55:51 -06:00
Michael Steed
24343645c3
py3: fix salt/utils/locales
...
fix str/bytes/unicode handling
add unit tests
2015-06-09 16:59:43 -06:00
Michael Steed
f85a3e39da
specify encoding in test_to_str()
2015-06-09 11:13:19 -06:00
Michael Steed
f163e50368
py3: fix salt/modules/network.py and friends
...
- dry: move mac address string-to-bytes conversion into a single routine
- add unit tests for said conversion routine
2015-06-08 16:03:19 -06:00
Michael Steed
a4c8e3172d
py3: fix salt/utils/rsax931.py and tests
2015-06-08 08:48:48 -06:00
Michael Steed
83a96367a4
Manual merge of #24414 per thatch45
2015-06-06 07:47:52 -06:00
Aneesh Agrawal
4b9311507c
Add new module type for serializers from issue #22257 .
...
Move existing serializers from salt.utils.serializers to
salt.serializers.
2015-05-28 20:03:11 -04:00
Thomas S Hatch
d951bc8ad4
Merge pull request #22548 from terminalmage/docker-ng
...
Add docker-ng state module
2015-05-15 12:09:58 -06:00
Erik Johnson
150d4e25c7
Update unit.utils.utils_test.UtilsTestCase.test_clean_kwargs
...
This reflects the new behavior in which all dunder kwargs are cleaned
2015-05-15 11:17:28 -05:00
Thomas S Hatch
6f1e03f3ce
Merge pull request #23388 from jfindlay/salt_url
...
salt:// URL escaping
2015-05-05 21:44:00 -06:00
Thomas S Hatch
a7e417cfd9
Merge pull request #23348 from msteed/remove-m2crypto
...
Remove m2crypto
2015-05-05 16:15:22 -06:00
Justin Findlay
0d514eda7d
add salt:// url (un)escaping methods
2015-05-05 15:19:50 -06:00
Michael Steed
c7ad84c8ae
egad, lint
2015-05-05 12:21:06 -06:00
Justin Findlay
336a48eca8
add salt.utils.url unit tests
2015-05-04 23:24:45 -06:00
Michael Steed
82c67f744d
add unit tests and fix a bug
2015-05-04 15:11:51 -06:00
Colton Myers
21d9de2995
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileclient.py
salt/utils/serializers/yaml.py
2015-04-29 11:47:06 -06:00
Justin Findlay
ffd18493e8
compare OrderedDicts in serializer unit test
2015-04-28 13:30:16 -06:00
Matthew Williams
bd40be4b02
Merge branch 'develop' into boto_dicts
2015-04-25 18:29:13 +00:00
Gareth J. Greenaway
58bce28f14
fixing various things that caused unit tests to fail. updating unit tests based on code changes
2015-04-22 21:30:58 -07:00
Matthew Williams
759b522a65
Revert "utils.boto: add temporary ability to use without loader"
...
This reverts commit 8d3556ebcd
2015-04-17 00:59:11 +00:00
Matthew Williams
8d3556ebcd
utils.boto: add temporary ability to use without loader
2015-04-16 23:04:18 +00:00
Matthew Williams
9ecf4f38a6
utils.boto: convert BotoExecutionError back to func
2015-04-15 08:30:40 +00:00
Matthew Williams
46bde83216
Merge remote-tracking branch 'origin/develop' into boto_utils
...
Conflicts:
salt/modules/boto_ec2.py
2015-04-14 20:07:57 +00:00
Thomas Jackson
435fc7ba61
Add some support pyzmq 13.0.x
...
pyzmq 13.0.x was the first version to support *any* tornado in pyzmq, and since 14.0.x they have changed the API (IMO into a more sensible one). This conditionally changes the name to match the new API's naming
2015-04-13 17:43:45 -07:00
Matthew Williams
b8ead7ab27
utils.boto get_exception -> class
2015-04-13 22:34:19 +00:00
Matthew Williams
45b118f93a
Merge remote-tracking branch 'origin/develop' into boto_utils
2015-04-13 15:43:01 +00:00
Matthew Williams
b3ec570499
utils.boto: add convenience partials
2015-04-13 15:42:32 +00:00
Mike Place
6a11ead5b4
Merge pull request #22453 from jacksontj/transport
...
Abstracted Transport
2015-04-13 09:38:52 -06:00
Matthew Williams
4976f863f9
utils.boto unit test -- use utf-8 encoding
2015-04-08 19:39:55 +00:00
Thomas Jackson
ce850a3e33
pylint cleanup
2015-04-08 08:20:17 -07:00
Matthew Williams
d642b5bc89
utils.boto: fix missing import and add regression test
2015-04-08 15:12:15 +00:00
Matthew Williams
28f3e5d0ad
utils.boto: add get_exception
2015-04-08 14:46:28 +00:00
Thomas Jackson
f5e2650227
Add basic tests for asyncEventpublisher
2015-04-07 21:01:43 -07:00
Matthew Williams
e22292220a
tests for utils.boto
2015-04-08 03:59:51 +00:00
jfindlay
396e8a5938
Merge pull request #20779 from cachedout/issue_20647
...
Use declared yaml options
2015-03-12 12:03:15 -06:00
Justin Findlay
fd829a95ff
compare OrderedDicts in serializer unit test
2015-03-12 10:47:34 -06:00
Pedro Algarvio
62f868a076
Merge branch '2015.2' into develop
2015-02-27 10:02:47 +00:00
