Revision a06c6ae8 test/ganeti.jqueue_unittest.py

b/test/ganeti.jqueue_unittest.py
305 305
      self.assertEqual(len(job.ops), len(ops))
306 306
      self.assert_(compat.all(inp.__getstate__() == op.input.__getstate__()
307 307
                              for (inp, op) in zip(ops, job.ops)))
308
      self.assertRaises(errors.OpExecError, job.GetInfo,
308
      self.assertRaises(errors.OpPrereqError, job.GetInfo,
309 309
                        ["unknown-field"])
310 310
      self.assertEqual(job.GetInfo(["summary"]),
311 311
                       [[op.input.Summary() for op in job.ops]])
......
674 674
             for i in range(opcount)]
675 675

  
676 676
      # Create job
677
      job = self._CreateJob(queue, job_id, ops)
677
      job = self._CreateJob(queue, str(job_id), ops)
678 678

  
679 679
      opexec = _FakeExecOpCodeForProc(queue, None, None)
680 680

  
......
702 702

  
703 703
      # Check job status
704 704
      self.assertEqual(job.CalcStatus(), constants.JOB_STATUS_ERROR)
705
      self.assertEqual(job.GetInfo(["id"]), [job_id])
705
      self.assertEqual(job.GetInfo(["id"]), [str(job_id)])
706 706
      self.assertEqual(job.GetInfo(["status"]), [constants.JOB_STATUS_ERROR])
707 707

  
708 708
      # Check opcode status
......
926 926
           for i in range(3)]
927 927

  
928 928
    # Create job
929
    job_id = 28492
929
    job_id = str(28492)
930 930
    job = self._CreateJob(queue, job_id, ops)
931 931

  
932 932
    self.assertEqual(job.CalcStatus(), constants.JOB_STATUS_QUEUED)

Also available in: Unified diff