← Back to branch summary

~cbehrens/nova/servers-search

« back to all changes in this revision

Viewing changes to nova/test.py

  • Committer: Chris Behrens
  • Date: 2011-08-04 21:58:42 UTC
  • mfrom: (1250.1.127 nova)
  • Revision ID: cbehrens@codestud.com-20110804215842-nfykqar8k74l33tj
merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/test.py
141
141
    def flags(self, **kw):
142
142
        """Override flag variables for a test."""
143
143
        for k, v in kw.iteritems():
144
 
            if k in self.flag_overrides:
145
 
                self.reset_flags()
146
 
                raise Exception(
147
 
                        'trying to override already overriden flag: %s' % k)
148
 
            self.flag_overrides[k] = getattr(FLAGS, k)
 
144
            # Store original flag value if it's not been overriden yet
 
145
            if k not in self.flag_overrides:
 
146
                self.flag_overrides[k] = getattr(FLAGS, k)
149
147
            setattr(FLAGS, k, v)
150
148
 
151
149
    def reset_flags(self):