Revision a9e1819b test/py/ganeti.jqueue_unittest.py

b/test/py/ganeti.jqueue_unittest.py
298 298
class TestQueuedOpCode(unittest.TestCase):
299 299
  def testDefaults(self):
300 300
    def _Check(op):
301
      self.assertFalse(hasattr(op.input, "dry_run"))
301
      self.assertFalse(op.input.dry_run)
302 302
      self.assertEqual(op.priority, constants.OP_PRIO_DEFAULT)
303 303
      self.assertFalse(op.log)
304 304
      self.assert_(op.start_timestamp is None)
......
432 432
    self.assertTrue(compat.all(op.priority == constants.OP_PRIO_DEFAULT
433 433
                               for op in job.ops))
434 434
    self.assertEqual(job.CalcPriority(), constants.OP_PRIO_DEFAULT)
435
    self.assertFalse(compat.any(hasattr(op.input, "priority")
436
                                for op in job.ops))
437 435

  
438 436
    return job
439 437

  
......
445 443
    result = job.ChangePriority(-10)
446 444
    self.assertEqual(job.CalcPriority(), -10)
447 445
    self.assertTrue(compat.all(op.priority == -10 for op in job.ops))
448
    self.assertFalse(compat.any(hasattr(op.input, "priority")
449
                                for op in job.ops))
450 446
    self.assertEqual(result,
451 447
                     (True, ("Priorities of pending opcodes for job 24984 have"
452 448
                             " been changed to -10")))
......
466 462
    self.assertEqual(job.CalcPriority(), constants.OP_PRIO_DEFAULT)
467 463
    self.assertTrue(compat.all(op.priority == constants.OP_PRIO_DEFAULT
468 464
                               for op in job.ops))
469
    self.assertFalse(compat.any(hasattr(op.input, "priority")
470
                                for op in job.ops))
471 465
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
472 466
      constants.OP_STATUS_SUCCESS,
473 467
      constants.OP_STATUS_SUCCESS,
......
491 485
    self.assertEqual(job.CalcPriority(), constants.OP_PRIO_DEFAULT)
492 486
    self.assertTrue(compat.all(op.priority == constants.OP_PRIO_DEFAULT
493 487
                               for op in job.ops))
494
    self.assertFalse(compat.any(hasattr(op.input, "priority")
495
                                for op in job.ops))
496 488
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
497 489
      constants.OP_STATUS_SUCCESS,
498 490
      constants.OP_STATUS_SUCCESS,
......
516 508
    self.assertEqual(job.CalcPriority(), constants.OP_PRIO_DEFAULT)
517 509
    self.assertEqual(map(operator.attrgetter("priority"), job.ops),
518 510
                     [constants.OP_PRIO_DEFAULT, 7, 7, 7])
519
    self.assertFalse(compat.any(hasattr(op.input, "priority")
520
                                for op in job.ops))
521 511
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
522 512
      constants.OP_STATUS_RUNNING,
523 513
      constants.OP_STATUS_QUEUED,
......
543 533
    self.assertEqual(job.CalcPriority(), constants.OP_PRIO_DEFAULT)
544 534
    self.assertTrue(compat.all(op.priority == constants.OP_PRIO_DEFAULT
545 535
                               for op in job.ops))
546
    self.assertFalse(compat.any(hasattr(op.input, "priority")
547
                                for op in job.ops))
548 536
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
549 537
      constants.OP_STATUS_SUCCESS,
550 538
      constants.OP_STATUS_SUCCESS,
......
568 556
    self.assertEqual(map(operator.attrgetter("priority"), job.ops),
569 557
                     [constants.OP_PRIO_DEFAULT, constants.OP_PRIO_DEFAULT,
570 558
                      -19, -19])
571
    self.assertFalse(compat.any(hasattr(op.input, "priority")
572
                                for op in job.ops))
573 559
    self.assertEqual(map(operator.attrgetter("status"), job.ops), [
574 560
      constants.OP_STATUS_SUCCESS,
575 561
      constants.OP_STATUS_RUNNING,
......
2269 2255
      result = proc(_nextop_fn=self._NextOpcode)
2270 2256
      assert self.curop is not None
2271 2257

  
2272
      # Input priority should never be set or modified
2273
      self.assertFalse(compat.any(hasattr(op.input, "priority")
2274
                                  for op in job.ops))
2275

  
2276 2258
      if result == jqueue._JobProcessor.FINISHED or self.gave_lock:
2277 2259
        # Got lock and/or job is done, result must've been written
2278 2260
        self.assertFalse(job.cur_opctx)

Also available in: Unified diff