Merge "Fix ExtraSpecsOpsTestCase sub unit tests"

This commit is contained in:
Jenkins 2016-04-08 13:52:58 +00:00 committed by Gerrit Code Review
commit 3493d4fbe8

View File

@ -24,6 +24,7 @@ from cinder import context
from cinder import db from cinder import db
from cinder import exception from cinder import exception
from cinder.scheduler import filters from cinder.scheduler import filters
from cinder.scheduler.filters import extra_specs_ops
from cinder import test from cinder import test
from cinder.tests.unit import fake_constants as fake from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit.scheduler import fakes from cinder.tests.unit.scheduler import fakes
@ -1025,7 +1026,7 @@ class TestBogusFilter(object):
class ExtraSpecsOpsTestCase(test.TestCase): class ExtraSpecsOpsTestCase(test.TestCase):
def _do_extra_specs_ops_test(self, value, req, matches): def _do_extra_specs_ops_test(self, value, req, matches):
assertion = self.assertTrue if matches else self.assertFalse assertion = self.assertTrue if matches else self.assertFalse
assertion(filters.extra_specs_ops.match(value, req)) assertion(extra_specs_ops.match(value, req))
def test_extra_specs_matches_simple(self): def test_extra_specs_matches_simple(self):
self._do_extra_specs_ops_test( self._do_extra_specs_ops_test(