diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-12 02:54:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-12 02:54:39 +0000 |
| commit | cfea4aed4aed208358560f9d70b4cbd3d577fc50 (patch) | |
| tree | 910eb6e1c27d2d80f1682fe07644c598a3fcd874 | |
| parent | 81b12c0dbf5a8912dae1144992ba2eeadae40f90 (diff) | |
| parent | f97de95a638347993545686ac9c225d831838340 (diff) | |
| download | python-ceilometerclient-cfea4aed4aed208358560f9d70b4cbd3d577fc50.tar.gz | |
Merge "base.Resource not define __ne__() built-in function"2.5.0
| -rw-r--r-- | ceilometerclient/openstack/common/apiclient/base.py | 3 | ||||
| -rw-r--r-- | ceilometerclient/tests/unit/test_openstack_common.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ceilometerclient/openstack/common/apiclient/base.py b/ceilometerclient/openstack/common/apiclient/base.py index 17016eb..3e5dc22 100644 --- a/ceilometerclient/openstack/common/apiclient/base.py +++ b/ceilometerclient/openstack/common/apiclient/base.py @@ -523,6 +523,9 @@ class Resource(object): return False return self._info == other._info + def __ne__(self, other): + return not self.__eq__(other) + def is_loaded(self): return self._loaded diff --git a/ceilometerclient/tests/unit/test_openstack_common.py b/ceilometerclient/tests/unit/test_openstack_common.py index 9fea065..04a94e2 100644 --- a/ceilometerclient/tests/unit/test_openstack_common.py +++ b/ceilometerclient/tests/unit/test_openstack_common.py @@ -33,7 +33,7 @@ class BaseTest(utils.BaseTestCase): self.assertEqual(r1, r2) def test_two_resources_with_diff_type_are_not_equal(self): - # Two resoruces of different types: never equal + # Two resources of different types: never equal r1 = base.Resource(None, {'id': 1}) r2 = events.Event(None, {'id': 1}) self.assertNotEqual(r1, r2) |