Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / test / py / cmdlib / instance_unittest.py

diff --git a/test/py/cmdlib/instance_unittest.py b/test/py/cmdlib/instance_unittest.py
index cba364e..51bc04e 100644 (file)
--- a/test/py/cmdlib/instance_unittest.py
+++ b/test/py/cmdlib/instance_unittest.py
@@ -2243,8 +2243,8 @@ class TestLUInstanceSetParams(CmdlibTestCase):
                                    constants.IDISK_MODE: "invalid",
                                    constants.IDISK_NAME: "new_name"
                                  }]])
-    self.ExecOpCodeExpectOpPrereqError(
-      op, "Disk modification doesn't support additional arbitrary parameters")
+    self.ExecOpCodeExpectException(op, errors.TypeEnforcementError,
+                                   "Unknown parameter 'metavg'")
 
   def testModifyDiskUnsetName(self):
     op = self.CopyOpCode(self.op,