Changeset 45

Timestamp:

Feb 23, 2010 5:31:18 PM (15 years ago)

Author:

retracile

Message:

Mergebot: get the tests to behave a bit better

File:

• mergebot/trunk/utils/test.py (modified) (4 diffs)

mergebot/trunk/utils/test.py

@@ -61 +61 @@
         while time.time() - start < timeout:
             try:
-                tc.reload()
+                #tc.reload() # This appears to re-POST
+                tc.go(b.get_url())
                 tc.find(search)
                 return
@@ -72 +73 @@
         while time.time() - start < timeout:
             try:
-                tc.reload()
+                #tc.reload() # This appears to re-POST
+                tc.go(b.get_url())
                 tc.notfind(search)
                 return
@@ -104 +106 @@
         self.go_to_mergebot()
         tc.formvalue('ops-%s' % ticket_id, 'ticket', ticket_id) # Essentially a noop to select the right form
-        print "submitting rebranch request for %s" % (ticket_id)
         tc.submit('Rebranch')
         self.wait_until_find('Nothing in the queue', timeout)
@@ -279 +280 @@
     suite.addTest(MergeBotTestNoVersion())
     suite.addTest(MergeBotTestBranch())
-    #suite.addTest(MergeBotTestRebranch())
+    suite.addTest(MergeBotTestRebranch())
     suite.addTest(MergeBotTestCheckMerge())
+    suite.addTest(MergeBotTestMerge())
     suite.addTest(MergeBotTestSingleUseCase())
-    suite.addTest(MergeBotTestMerge())
     return suite