From 0f03d8d41497b8776fb2e5903cce3477625d89f9 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 31 Oct 2011 17:33:28 +0100
Subject: [PATCH] Clean up incorrect merge 7dcf333d
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The unittests weren't corrected for the master branch.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
test/ganeti.rapi.rlib2_unittest.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index bd323e2ee..8c70c3ea0 100755
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -1472,12 +1472,18 @@ class TestInstanceReplaceDisks(unittest.TestCase):
self.assertRaises(IndexError, cl.GetNextSubmittedJob)
def testNoDisks(self):
- self.assertRaises(http.HttpBadRequest, self.Parse, "inst20661", {})
+ clfactory = _FakeClientFactory(_FakeClient)
+
+ handler = _CreateHandler(rlib2.R_2_instances_name_replace_disks,
+ ["inst20661"], {}, {}, clfactory)
+ self.assertRaises(http.HttpBadRequest, handler.POST)
for disks in [None, "", {}]:
- self.assertRaises(http.HttpBadRequest, self.Parse, "inst20661", {
+ handler = _CreateHandler(rlib2.R_2_instances_name_replace_disks,
+ ["inst20661"], {}, {
"disks": disks,
- })
+ }, clfactory)
+ self.assertRaises(http.HttpBadRequest, handler.POST)
def testWrong(self):
clfactory = _FakeClientFactory(_FakeClient)
--
GitLab