Revision 47099cd1 test/ganeti.rapi.client_unittest.py

b/test/ganeti.rapi.client_unittest.py
155 155
    self.assertEqual(client._NODE_EVAC_RES1, rlib2._NODE_EVAC_RES1)
156 156
    self.assertEqual(client._INST_NIC_PARAMS, constants.INIC_PARAMS)
157 157
    self.assertEqual(client.JOB_STATUS_QUEUED, constants.JOB_STATUS_QUEUED)
158
    self.assertEqual(client.JOB_STATUS_WAITLOCK, constants.JOB_STATUS_WAITLOCK)
158
    self.assertEqual(client.JOB_STATUS_WAITING, constants.JOB_STATUS_WAITING)
159 159
    self.assertEqual(client.JOB_STATUS_CANCELING,
160 160
                     constants.JOB_STATUS_CANCELING)
161 161
    self.assertEqual(client.JOB_STATUS_RUNNING, constants.JOB_STATUS_RUNNING)
......
165 165
    self.assertEqual(client.JOB_STATUS_FINALIZED, constants.JOBS_FINALIZED)
166 166
    self.assertEqual(client.JOB_STATUS_ALL, constants.JOB_STATUS_ALL)
167 167

  
168
    # Legacy name
169
    self.assertEqual(client.JOB_STATUS_WAITLOCK, constants.JOB_STATUS_WAITING)
170

  
168 171

  
169 172
class RapiMockTest(unittest.TestCase):
170 173
  def test(self):
......
1237 1240

  
1238 1241
  def testWaitForJobCompletionNoChange(self):
1239 1242
    resp = serializer.DumpJson({
1240
      "status": constants.JOB_STATUS_WAITLOCK,
1243
      "status": constants.JOB_STATUS_WAITING,
1241 1244
      })
1242 1245

  
1243 1246
    for retries in [1, 5, 25]:

Also available in: Unified diff