Revision f4bc1f2c qa/qa_node.py

b/qa/qa_node.py
94 94
  master = qa_config.GetMasterNode()
95 95

  
96 96
  if qa_utils.GetNodeInstances(node2, secondaries=False):
97
    raise qa_error.UnusableNodeError("Secondary node has at least one "
98
                                     "primary instance. This test requires "
99
                                     "it to have no primary instances.")
97
    raise qa_error.UnusableNodeError("Secondary node has at least one"
98
                                     " primary instance. This test requires"
99
                                     " it to have no primary instances.")
100 100

  
101 101
  # Fail over to secondary node
102 102
  cmd = ['gnt-node', 'failover', '-f', node['primary']]
......
117 117
  node3 = qa_config.AcquireNode(exclude=[node, node2])
118 118
  try:
119 119
    if qa_utils.GetNodeInstances(node3, secondaries=True):
120
      raise qa_error.UnusableNodeError("Evacuation node has at least one "
121
                                       "secondary instance. This test requires "
122
                                       "it to have no secondary instances.")
120
      raise qa_error.UnusableNodeError("Evacuation node has at least one"
121
                                       " secondary instance. This test requires"
122
                                       " it to have no secondary instances.")
123 123

  
124 124
    # Evacuate all secondary instances
125 125
    cmd = ['gnt-node', 'evacuate', '-f', node2['primary'], node3['primary']]

Also available in: Unified diff