switch FLAGS.* = in tests to self.flags(...)

remove unused cases of FLAGS from tests
modified test.TestCase's flags() to allow multiple overrides
added missing license to test_rpc_amqp.py
This commit is contained in:
Chris Behrens
2011-08-03 12:22:58 -07:00
parent 37a51f83e6
commit ece2f4f15f
9 changed files with 46 additions and 46 deletions

View File

@@ -142,11 +142,9 @@ class TestCase(unittest.TestCase):
def flags(self, **kw):
"""Override flag variables for a test."""
for k, v in kw.iteritems():
if k in self.flag_overrides:
self.reset_flags()
raise Exception(
'trying to override already overriden flag: %s' % k)
self.flag_overrides[k] = getattr(FLAGS, k)
# Store original flag value if it's not been overriden yet
if k not in self.flag_overrides:
self.flag_overrides[k] = getattr(FLAGS, k)
setattr(FLAGS, k, v)
def reset_flags(self):