Changeset 69 for mergebot/trunk/utils/test.py
- Timestamp:
- Feb 24, 2010 2:14:50 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
mergebot/trunk/utils/test.py
r68 r69 857 857 #self._tester.go_to_mergebot() 858 858 tc.find('Waiting') 859 self._tester.wait_for_empty_queue( 60)859 self._tester.wait_for_empty_queue(180) # Has to be large for slow machines 860 860 861 861 self.switch() … … 903 903 self._tester.queue_merge(ticket_one) 904 904 self._tester.queue_merge(ticket_two) 905 self._tester.wait_for_empty_queue( 60)905 self._tester.wait_for_empty_queue(180) # Has to be large for slow machines 906 906 # Then we verify that one had conflicts, and one was cancelled. 907 907 self._tester.go_to_ticket(ticket_one)
Note: See TracChangeset
for help on using the changeset viewer.