openstack/ceilometer
Code Issues Proposed changes

Merge "remove jsonpath-rw requirement"

Browse Source
This commit is contained in:
Jenkins 2015-08-27 16:17:59 +00:00 committed by Gerrit Code Review
commit f4df5cb3f5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/tests/unit/event/test_converter.py
View File

@ -15,7 +15,7 @@
import datetime
import jsonpath_rw
import jsonpath_rw_ext
import mock
from oslo_config import fixture as fixture_config
import six
@ -296,14 +296,14 @@ class TestTraitDefinition(ConverterBase):
def test_string_fields_config(self):
cfg = dict(fields='payload.test')
t = converter.TraitDefinition('test_trait', cfg, self.fake_plugin_mgr)
self.assertPathsEqual(t.fields, jsonpath_rw.parse('payload.test'))
self.assertPathsEqual(t.fields, jsonpath_rw_ext.parse('payload.test'))
def test_list_fields_config(self):
cfg = dict(fields=['payload.test', 'payload.other'])
t = converter.TraitDefinition('test_trait', cfg, self.fake_plugin_mgr)
self.assertPathsEqual(
t.fields,
jsonpath_rw.parse('(payload.test)|(payload.other)'))
jsonpath_rw_ext.parse('(payload.test)|(payload.other)'))
def test_invalid_path_config(self):
# test invalid jsonpath...

1
requirements.txt
View File

@ -5,7 +5,6 @@
retrying!=1.3.0,>=1.2.3 # Apache-2.0
croniter>=0.3.4 # MIT License
eventlet>=0.17.4
jsonpath-rw<2.0,>=1.2.0
jsonpath-rw-ext>=0.1.7
jsonschema!=2.5.0,<3.0.0,>=2.0.0
kafka-python>=0.9.2 # Apache-2.0