Update ThunderbirdTrunk to Thunderbird-Trunk to match new tbpl and automation
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 05 May 2012 08:38:33 +0100
changeset 139 61b22f7461bd37079be28dade3d9602059c1825c
parent 138 4ee58bd47d470f14fe56bc83c35b77623c37d62d
child 140 fb2a907cea705fdcf82d0fb50704085c17d42227
push id69
push userbugzilla@standard8.plus.com
push dateSat, 05 May 2012 07:38:40 +0000
Update ThunderbirdTrunk to Thunderbird-Trunk to match new tbpl and automation
mozhghooks/treeclosure_comm_central.py
runtests.py
--- a/mozhghooks/treeclosure_comm_central.py
+++ b/mozhghooks/treeclosure_comm_central.py
@@ -30,17 +30,17 @@ calendarOwns = [
 seamonkeyOwns = [
   'suite'
 ]
 # Everything else is assumed to be controlled by Thunderbird.
 
 
 # Thunderbird tinderbox trees
 thunderbirdTrees = {
-  'comm-central': 'http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html',
+  'comm-central': 'http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html',
   'comm-aurora' : 'http://tinderbox.mozilla.org/Thunderbird-Aurora/status.html',
   'comm-beta'   : 'http://tinderbox.mozilla.org/Thunderbird-Beta/status.html',
   'comm-release': 'http://tinderbox.mozilla.org/Thunderbird-Release/status.html',
   'comm-esr10'  : 'http://tinderbox.mozilla.org/Thunderbird-Esr10/status.html',
   'comm-miramar': 'http://tinderbox.mozilla.org/Miramar/status.html',
   # Point at SeaMonkey as we don't use this one
   'comm-2.0'    : 'http://tinderbox.mozilla.org/SeaMonkey2.1/status.html',
   'comm-1.9.2'  : 'http://tinderbox.mozilla.org/Thunderbird3.1/status.html',
--- a/runtests.py
+++ b/runtests.py
@@ -375,17 +375,17 @@ class TestTreeCommCentralClosureHook(Clo
     appendFile(fileLoc, "checkin 1")
     add(u, self.clonerepo, fileLoc)
     commit(u, self.clonerepo, message="checkin 1")
     push(u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 1)
 
  
   def testCCOpenThunderbird(self):
-    self.actualTestCCOpen("ThunderbirdTrunk", ["testfile"])
+    self.actualTestCCOpen("Thunderbird-Trunk", ["testfile"])
 
   def testCCOpenSeaMonkey(self):
     self.actualTestCCOpen("SeaMonkey", ["suite", "build", "test"])
 
   def testCCOpenCalendar1(self):
     self.actualTestCCOpen("CalendarTrunk", ["calendar", "app", "test"])
 
   def testCCOpenCalendar2(self):
@@ -412,17 +412,17 @@ class TestTreeCommCentralClosureHook(Clo
 
     appendFile(fileLoc, "checkin 1")
     add(u, self.clonerepo, fileLoc)
     commit(u, self.clonerepo, message="checkin 1")
     self.assertRaises(util.Abort, push, u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 1)
 
   def testCCClosedThunderbird(self):
-    self.actualTestCCClosed("ThunderbirdTrunk", ["testfile"])
+    self.actualTestCCClosed("Thunderbird-Trunk", ["testfile"])
 
   def testCCClosedSeaMonkey(self):
     self.actualTestCCClosed("SeaMonkey", ["suite", "build", "test"])
 
   def testCCClosedCalendar1(self):
     self.actualTestCCClosed("CalendarTrunk", ["calendar", "app", "test"])
 
   def testCCClosedCalendar2(self):
@@ -430,84 +430,84 @@ class TestTreeCommCentralClosureHook(Clo
 
   # In theory adding CLOSED TREE is the same code-path for all projects,
   # so just checking for one project
   def testCCClosedThunderbirdMagicWords(self):
     """
     Pushing to a CLOSED Thunderbird tree with 'CLOSED TREE' in the commit message
     should succeed.
     """
-    self.redirect("http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html",
                          '<span id="tree-status">CLOSED</span><span id="extended-status">')
     u = self.ui
     appendFile(join(self.clonedir, "testfile"), "checkin 1")
     add(u, self.clonerepo, join(self.clonedir, "testfile"))
     commit(u, self.clonerepo, message="checkin 1 CLOSED TREE")
     push(u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 1)
 
   # In theory adding CLOSED TREE is the same code-path for all projects,
   # so just checking for one project
   def testCCClosedThunderbirdMagicWordsTip(self):
     """
     Pushing multiple changesets to a CLOSED Thunderbird tree with 'CLOSED TREE'
     in the commit message of the tip changeset should succeed.
     """
-    self.redirect("http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html",
                          '<span id="tree-status">CLOSED</span><span id="extended-status">')
     u = self.ui
     appendFile(join(self.clonedir, "testfile"), "checkin 1")
     add(u, self.clonerepo, join(self.clonedir, "testfile"))
     commit(u, self.clonerepo, message="checkin 1")
     appendFile(join(self.clonedir, "testfile"), "checkin 2")
     commit(u, self.clonerepo, message="checkin 2 CLOSED TREE")
 
     push(u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 1)
 
   def testCCApprovalRequired(self):
     """Pushing to an APPROVAL REQUIRED tree should fail."""
-    self.redirect("http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html",
                          '<span id="tree-status">APPROVAL REQUIRED</span><span id="extended-status">')
     # pushing something should now fail
     u = self.ui
     appendFile(join(self.clonedir, "testfile"), "checkin 1")
     add(u, self.clonerepo, join(self.clonedir, "testfile"))
     commit(u, self.clonerepo, message="checkin 1")
     self.assertRaises(util.Abort, push, u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 1)
 
   def testCCApprovalRequiredMagicWords(self):
     """
     Pushing to an APPROVAL REQUIRED tree with a=foo
     in the commit message should succeed.
     """
-    self.redirect("http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html",
                          '<span id="tree-status">APPROVAL REQUIRED</span><span id="extended-status">')
     u = self.ui
     appendFile(join(self.clonedir, "testfile"), "checkin 1")
     add(u, self.clonerepo, join(self.clonedir, "testfile"))
     commit(u, self.clonerepo, message="checkin 1 a=someone")
     push(u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 1)
 
     # also check that approval of the form a1.2=foo works
-    self.redirect("http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html",
                          '<span id="tree-status">APPROVAL REQUIRED</span><span id="extended-status">')
     appendFile(join(self.clonedir, "testfile"), "checkin 2")
     commit(u, self.clonerepo, message="checkin 2 a1.2=someone")
     push(u, self.clonerepo, dest=self.repodir)
     self.assertEqual(self.director.opened, 2)
 
   def testCCApprovalRequiredMagicWordsTip(self):
     """
     Pushing to an APPROVAL REQUIRED tree with a=foo
     in the commit message of the tip changeset should succeed.
     """
-    self.redirect("http://tinderbox.mozilla.org/ThunderbirdTrunk/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Thunderbird-Trunk/status.html",
                          '<span id="tree-status">APPROVAL REQUIRED</span><span id="extended-status">')
     u = self.ui
     appendFile(join(self.clonedir, "testfile"), "checkin 1")
     add(u, self.clonerepo, join(self.clonedir, "testfile"))
     commit(u, self.clonerepo, message="checkin 1")
     appendFile(join(self.clonedir, "testfile"), "checkin 1")
     commit(u, self.clonerepo, message="checkin 2 a=someone")