Fix Resource.__eq__ mismatch semantics of object equal

The __eq__ of apiclient.base.Resource will return True,
if the two objects have same id, even if they have different
other attributes value. The behavior is weird and don't
match the semantics of object equal. The objects that have
different value should be different objects.
Fix this issue and add some test cases in this patch.

Change-Id: I187032e5630ac47a4f54db5058dbf9b6e15eba6d
Closes-Bug: #1499369
This commit is contained in:
Rui Chen 2015-11-28 16:04:40 +08:00
parent d4569534b4
commit eb1cddbc28
2 changed files with 6 additions and 3 deletions

View File

@ -522,8 +522,6 @@ class Resource(RequestIdMixin):
# two resources of different types are not equal
if not isinstance(other, self.__class__):
return False
if hasattr(self, 'id') and hasattr(other, 'id'):
return self.id == other.id
return self._info == other._info
def is_loaded(self):

View File

@ -48,9 +48,14 @@ class BaseTest(utils.TestCase):
self.assertEqual(4, base.getid(TmpObject))
def test_eq(self):
# Two resources of the same type with the same id: equal
# Two resources with same ID: never equal if their info is not equal
r1 = base.Resource(None, {'id': 1, 'name': 'hi'})
r2 = base.Resource(None, {'id': 1, 'name': 'hello'})
self.assertNotEqual(r1, r2)
# Two resources with same ID: equal if their info is equal
r1 = base.Resource(None, {'id': 1, 'name': 'hello'})
r2 = base.Resource(None, {'id': 1, 'name': 'hello'})
self.assertEqual(r1, r2)
# Two resoruces of different types: never equal