Revision f1501b3f test/ganeti.locking_unittest.py

b/test/ganeti.locking_unittest.py
492 492
      self.sl.acquire()
493 493

  
494 494
      # Start shared acquires with timeout between 0 and 20 ms
495
      for i in xrange(11):
495
      for i in range(11):
496 496
        self._addThread(target=_AcquireWithTimeout,
497 497
                        args=(shared, i * 2.0 / 1000.0))
498 498

  
......
503 503
      # Release lock
504 504
      self.sl.release()
505 505

  
506
      for _ in xrange(11):
506
      for _ in range(11):
507 507
        self.assertEqual(self.done.get_nowait(), "timeout")
508 508

  
509 509
      self.assertRaises(Queue.Empty, self.done.get_nowait)
......
583 583
    self.assertEqual(shrcnt3, 0)
584 584
    self.assertEqual(shrcnt3, 0)
585 585

  
586
    for _ in xrange(3):
586
    for _ in range(3):
587 587
      self.assertEqual(self.done.get_nowait(), "exclusive 1")
588 588

  
589
    for _ in xrange(3):
589
    for _ in range(3):
590 590
      self.assertEqual(self.done.get_nowait(), "exclusive 2")
591 591

  
592 592
    self.assertRaises(Queue.Empty, self.done.get_nowait)
......
615 615
      self.sl.release()
616 616

  
617 617
    acquires = []
618
    for _ in xrange(3):
618
    for _ in range(3):
619 619
      ev = threading.Event()
620 620
      self._addThread(target=_AcquireShared, args=(ev, ))
621 621
      acquires.append(ev)
......
675 675
        self.done.put("shared2")
676 676
        self.sl.release()
677 677

  
678
    for _ in xrange(10):
678
    for _ in range(10):
679 679
      self._addThread(target=_AcquireSharedSimple)
680 680

  
681 681
    # Tell exclusive lock to release
......
691 691
    self.assertEqual(self.sl._count_pending(), 0)
692 692

  
693 693
    # Check sequence
694
    for _ in xrange(3):
694
    for _ in range(3):
695 695
      self.assertEqual(self.done.get_nowait(), "shared")
696 696

  
697 697
    self.assertEqual(self.done.get_nowait(), "exclusive")
698 698

  
699
    for _ in xrange(10):
699
    for _ in range(10):
700 700
      self.assertEqual(self.done.get_nowait(), "shared2")
701 701

  
702 702
    self.assertRaises(Queue.Empty, self.done.get_nowait)

Also available in: Unified diff