Merge remote-tracking branch 'upstream/master'

dims · Jun 30, 2015 · f59b5cf · f59b5cf
2 parents 291bc83 + 9cb24b3
commit f59b5cf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py
@@ -39,6 +39,7 @@
 from sqlalchemy import Column
 from sqlalchemy.dialects import sqlite
 from sqlalchemy.exc import OperationalError
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy import inspect
 from sqlalchemy import Integer
 from sqlalchemy import MetaData
@@ -2788,7 +2789,8 @@ def test_instance_extra_get_with_columns(self):
         extra = db.instance_extra_get_by_instance_uuid(
             self.ctxt, self.instance['uuid'],
             columns=['numa_topology', 'vcpu_model'])
-        self.assertNotIn('pci_requests', extra)
+        self.assertRaises(SQLAlchemyError,
+                          extra.__getitem__, 'pci_requests')
         self.assertIn('numa_topology', extra)
         self.assertIn('vcpu_model', extra)