Commit Graph

408 Commits

Author SHA1 Message Date
Dmitry Kuzmenko
5c6276ac7d Subscribe event to bus is optional now
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-08-03 16:10:38 -06:00
Colton Myers
abf389743a Merge pull request #25903 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-08-03 11:12:18 -06:00
Pedro Algarvio
05165467e8 Allow schemas to override it's class attribute name 2015-07-31 22:42:43 +01:00
Pedro Algarvio
55918b7d50 Allow schema items to override it's class attribute name 2015-07-31 21:00:22 +01:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -06:00
Thomas Jackson
fb4cdc475f Keep track of SyncWrapper's IOLoop usage
While thinking through issues that might cause #25718 I ran into this case-- where you can create 2 sync wrappers with the same parent IOLoop and run into problems because you can't start/stop the loop multiple times like that and have the call tree work correctly. To solve this (since it *should* be the exceptional case) I'm making SyncWrapper keep track of which loops are in use-- then if someone attempts this situation it will simply make another one.
2015-07-29 08:48:33 -07:00
Dmitry Kuzmenko
bf9dd00aac Subscribe event to bus is optional now
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-07-29 17:44:02 +03:00
Pedro Algarvio
c7b5fccb9e Change cwd back to Salt's code dir 2015-07-28 12:22:53 +01:00
Pedro Algarvio
10c47647e3 Also rename the test module 2015-07-28 10:33:08 +01:00
Pedro Algarvio
143e8fa200 Let's call it for what it is! 2015-07-28 00:42:55 +01:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
2015-07-20 13:55:14 -06:00
Mike Place
89d595f002 Lint config_test 2015-07-20 11:18:31 -06:00
Pedro Algarvio
7c0ad43906 Another fix for flattened properties and test cases 2015-07-17 18:24:43 +01:00
Pedro Algarvio
85b191c4b9 Test case to make sure plain string requirements have the same outcome 2015-07-17 17:58:52 +01:00
Pedro Algarvio
6b09ec0c30 Fix requirements items since they broke with the previous 2 commits. 2015-07-17 17:23:17 +01:00
Pedro Algarvio
6e1ee65421 Test case for missing required entries when flattening Schemas 2015-07-17 17:23:07 +01:00
Pedro Algarvio
393a21117e Rename the module 2015-07-16 17:04:22 +01:00
Pedro Algarvio
42bfec8bb5 Let's call it for what it is! 2015-07-16 17:01:42 +01:00
Jonathan Leroy
bc36d05c0c
Support for IPv6 addresses scopes in network.interfaces (ifconfig) 2015-07-15 01:14:32 +02:00
Pedro Algarvio
1388010187 Remove hardcoded maxDiff 2015-07-09 20:59:59 +01:00
Pedro Algarvio
3adb731abc Fixed ordering issue 2015-07-09 20:57:23 +01:00
Pedro Algarvio
cf071eaffa Add test which asserts proper field ordering 2015-07-09 17:32:50 +01:00
Pedro Algarvio
f36123c4df ArrayConfig must have items passed. Added DictConfig with tests. 2015-07-07 15:10:16 +01:00
Pedro Algarvio
884212532a Add test for subclassed Configuration classes 2015-07-07 10:45:29 +01:00
Pedro Algarvio
44738b2123 Lint fixes 2015-07-03 17:56:31 +01:00
Pedro Algarvio
f84c3e4fbd Add support for enumNames 2015-07-03 16:40:48 +01:00
Pedro Algarvio
0d9173c57e Remove repeated test 2015-07-03 16:28:57 +01:00
Pedro Algarvio
625e0b6c06 Implement oneOf, anyOf, allOf and not with unit tests 2015-07-03 16:24:46 +01:00
Pedro Algarvio
237023dde0 Support Configuration as an array item 2015-07-02 17:38:06 +01:00
Pedro Algarvio
51e76c3a38 Properly handle salt.utils.config.Null 2015-07-02 17:38:06 +01:00
Pedro Algarvio
e0f4706ef6 Add array support to salt.utils.config (with unit tests) 2015-07-02 17:38:06 +01:00
Pedro Algarvio
545d7e0a34 PyLint fixes 2015-07-02 10:10:25 +01:00
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
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn."
This reverts commit 5d35f856ac.
2015-02-26 09:41:22 +00:00
Mike Place
26b3ec0be3 Context cache decorator 2015-02-23 19:27:27 -07:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890 Merge pull request #20616 from rallytime/merge-20419
Merge #20419 with test syntax fix
2015-02-12 10:38:53 -07:00
rallytime
6b2d64b557 Fix second pylint error that popped up 2015-02-11 22:07:37 -07:00
rallytime
789570fb94 Fix pylint/syntax of test in which_test to merge #20419 2015-02-11 21:48:34 -07:00
Hung Nguyen Viet
d10ce3ade2 fix unittest for windows 2015-02-12 01:37:40 +07:00
Arnold Bechtoldt
9de6c1d839 improve test tests/unit/utils/validate_net_test.py useability 2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db do call class methods correctly 2015-02-09 09:45:12 +01:00
Arnold Bechtoldt
2c5f5f8bf7 fix pep8 lint checks, refs #20508 2015-02-09 09:14:38 +01:00
Arnold Bechtoldt
ef7834db76 fix broken ipv6 address verification in salt.utils.validate.net 2015-02-08 23:48:05 +01:00
rallytime
db612d0b81 Clean up some pylint on 2015.2
This way PRs against 2015.2 will be a little happier
2015-02-06 07:58:26 -07:00
rallytime
02d3235cf2 Fix remaining pylint errors on develop 2015-02-04 21:11:17 -07:00
Pedro Algarvio
482016eea3 Py3 compatibility 2015-01-30 22:27:05 +00:00
Pedro Algarvio
72654ad0a9 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
85b66a47c5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00
Pedro Algarvio
a8ff8fa0b5 Py3 compatibility fixes 2015-01-30 22:25:11 +00:00