Revision 3c631ea2 test/ganeti.jqueue_unittest.py

b/test/ganeti.jqueue_unittest.py
398 398
    result = job.ChangePriority(-10)
399 399
    self.assertEqual(job.CalcPriority(), -10)
400 400
    self.assertTrue(compat.all(op.priority == -10 for op in job.ops))
401
    self.assertTrue(compat.all(op.input.priority == -10 for op in job.ops))
401
    self.assertFalse(compat.any(hasattr(op.input, "priority")
402
                                for op in job.ops))
402 403
    self.assertEqual(result,
403 404
                     (True, ("Priorities of pending opcodes for job 24984 have"
404 405
                             " been changed to -10")))
......
468 469
    self.assertEqual(job.CalcPriority(), constants.OP_PRIO_DEFAULT)
469 470
    self.assertEqual(map(operator.attrgetter("priority"), job.ops),
470 471
                     [constants.OP_PRIO_DEFAULT, 7, 7, 7])
471
    self.assertEqual([getattr(op.input, "priority", None) for op in job.ops],
472
                     [None, 7, 7, 7])
472
    self.assertFalse(compat.any(hasattr(op.input, "priority")
473
                                for op in job.ops))
473 474
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
474 475
      constants.OP_STATUS_RUNNING,
475 476
      constants.OP_STATUS_QUEUED,
......
520 521
    self.assertEqual(map(operator.attrgetter("priority"), job.ops),
521 522
                     [constants.OP_PRIO_DEFAULT, constants.OP_PRIO_DEFAULT,
522 523
                      -19, -19])
523
    self.assertEqual([getattr(op.input, "priority", None) for op in job.ops],
524
                     [None, None, -19, -19])
524
    self.assertFalse(compat.any(hasattr(op.input, "priority")
525
                                for op in job.ops))
525 526
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
526 527
      constants.OP_STATUS_SUCCESS,
527 528
      constants.OP_STATUS_RUNNING,
......
2221 2222
      result = proc(_nextop_fn=self._NextOpcode)
2222 2223
      assert self.curop is not None
2223 2224

  
2225
      # Input priority should never be set or modified
2226
      self.assertFalse(compat.any(hasattr(op.input, "priority")
2227
                                  for op in job.ops))
2228

  
2224 2229
      if result == jqueue._JobProcessor.FINISHED or self.gave_lock:
2225 2230
        # Got lock and/or job is done, result must've been written
2226 2231
        self.assertFalse(job.cur_opctx)

Also available in: Unified diff