From c6e300e6ec7644d3e74bc3ab3d29a729a125afcf Mon Sep 17 00:00:00 2001
From: Bernardo Dal Seno <bdalseno@google.com>
Date: Tue, 12 Feb 2013 14:53:44 +0100
Subject: [PATCH] Fix a merge issue in 3c296f56

Lines removed in devel-2.7 (250a9404) weren't removed in the merge with
master.

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 qa/qa_cluster.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 60b720816..142dc0251 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -672,24 +672,6 @@ def TestSetExclStorCluster(newvalue):
   return oldvalue
 
 
-def _BuildSetESCmd(value, node_name):
-  return ["gnt-node", "modify", "--node-parameters",
-          "exclusive_storage=%s" % value, node_name]
-
-
-def TestExclStorSingleNode(node):
-  """cluster-verify reports exclusive_storage set only on one node.
-
-  """
-  node_name = node.primary
-  es_val = _GetBoolClusterField("exclusive_storage")
-  assert not es_val
-  AssertCommand(_BuildSetESCmd(True, node_name))
-  AssertClusterVerify(fail=True, errors=[constants.CV_EGROUPMIXEDESFLAG])
-  AssertCommand(_BuildSetESCmd("default", node_name))
-  AssertClusterVerify()
-
-
 def TestExclStorSharedPv(node):
   """cluster-verify reports LVs that share the same PV with exclusive_storage.
 
-- 
GitLab