openstack/swift
Code Issues Proposed changes

Merge "Add __ne__ built-in function"

Browse Source
This commit is contained in:
Jenkins 2016-07-07 21:13:17 +00:00 committed by Gerrit Code Review
commit e7ec26dbd9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swift/common/manager.py
View File

@ -441,6 +441,9 @@ class Server(object):
except AttributeError: except AttributeError:
return False return False
def __ne__(self, other):
return not self.__eq__(other)
def get_pid_file_name(self, conf_file): def get_pid_file_name(self, conf_file):
"""Translate conf_file to a corresponding pid_file """Translate conf_file to a corresponding pid_file

7
test/unit/common/ring/test_builder.py
View File

@ -2154,13 +2154,6 @@ class TestRingBuilder(unittest.TestCase):
# now double up a device assignment # now double up a device assignment
rb._replica2part2dev[1][200] = rb._replica2part2dev[2][200] rb._replica2part2dev[1][200] = rb._replica2part2dev[2][200]
class SubStringMatcher(object):
def __init__(self, substr):
self.substr = substr
def __eq__(self, other):
return self.substr in other
with self.assertRaises(exceptions.RingValidationError) as e: with self.assertRaises(exceptions.RingValidationError) as e:
rb.validate() rb.validate()