Update the comm-central tree closure hooks for the recent changes to the branching. rs=Callek for the changes to the tree dependency list
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 29 Mar 2011 17:59:56 +0100
changeset 54 41ed29faac3951d3919bd5dd19389545ec6b56cb
parent 53 033dd0cc2d55f6e961fe79fb2fe4079919754a09
child 55 31a13eb17a38b49d0e4b9f9065d77868ab136048
push id21
push userbugzilla@standard8.plus.com
push dateTue, 29 Mar 2011 17:00:33 +0000
reviewersCallek
Update the comm-central tree closure hooks for the recent changes to the branching. rs=Callek for the changes to the tree dependency list
mozhghooks/treeclosure_comm_central.py
runtests.py
--- a/mozhghooks/treeclosure_comm_central.py
+++ b/mozhghooks/treeclosure_comm_central.py
@@ -30,34 +30,35 @@ calendarOwns = [
 seamonkeyOwns = [
   'suite'
 ]
 # Everything else is assumed to be controlled by Thunderbird.
 
 
 # Thunderbird tinderbox trees
 thunderbirdTrees = {
-  'comm-central': 'http://tinderbox.mozilla.org/Thunderbird/status.html',
-  'comm-1.9.1'  : 'http://tinderbox.mozilla.org/Thunderbird3.0/status.html',
-  'comm-1.9.2'  : 'http://tinderbox.mozilla.org/Thunderbird3.1/status.html'
+  'comm-central': 'http://tinderbox.mozilla.org/Miramar/status.html',
+  'comm-1.9.2'  : 'http://tinderbox.mozilla.org/Thunderbird3.1/status.html',
+  # Point at SeaMonkey as we don't use this one any more.
+  'comm-1.9.1'  : 'http://tinderbox.mozilla.org/SeaMonkey2.0/status.html',
 }
 # SeaMonkey tinderbox trees
 seamonkeyTrees = {
-  'comm-central': 'http://tinderbox.mozilla.org/SeaMonkey/status.html',
+  'comm-central': 'http://tinderbox.mozilla.org/SeaMonkey2.1/status.html',
   'comm-1.9.1'  : 'http://tinderbox.mozilla.org/SeaMonkey2.0/status.html',
-   # SeaMonkey doesn't support 1.9.2. So therefore just point it at the
-   # Thunderbird tree so that if cross-app patches get pushed, we don't get
-   # the annoying message saying that the SeaMonkey tree can't be found.
+  # Point at Thunderbird as SeaMonkey doesn't use this.
   'comm-1.9.2'  : 'http://tinderbox.mozilla.org/Thunderbird3.1/status.html'
 }
 # Calendar tinderbox trees
 calendarTrees = {
-  'comm-central': 'http://tinderbox.mozilla.org/Sunbird/status.html',
-  'comm-1.9.1'  : 'http://tinderbox.mozilla.org/Calendar1.0/status.html',
-  'comm-1.9.2'  : 'http://tinderbox.mozilla.org/Calendar1.0/status.html',
+  'comm-central': 'http://tinderbox.mozilla.org/Calendar1.0/status.html',
+  # Point at Thunderbird as Calendar doesn't use this
+  'comm-1.9.2'  : 'http://tinderbox.mozilla.org/Thunderbird3.1/status.html',
+  # Point at SeaMonkey as Calendar doesn't use this.
+  'comm-1.9.1'  : 'http://tinderbox.mozilla.org/SeaMonkey2.0/status.html',
 }
 
 
 magicwords = "CLOSED TREE"
 
 # This function actually does the checking to see if a tree is closed or set
 # to approval required.
 def checkTreeState(repo, repoName, treeName, treeUrl):
--- a/runtests.py
+++ b/runtests.py
@@ -375,26 +375,26 @@ 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("Thunderbird", ["testfile"])
+    self.actualTestCCOpen("Miramar", ["testfile"])
 
   def testCCOpenSeaMonkey(self):
-    self.actualTestCCOpen("SeaMonkey", ["suite", "build", "test"])
+    self.actualTestCCOpen("SeaMonkey2.1", ["suite", "build", "test"])
 
   def testCCOpenCalendar1(self):
-    self.actualTestCCOpen("Sunbird", ["calendar", "app", "test"])
+    self.actualTestCCOpen("Calendar1.0", ["calendar", "app", "test"])
 
   def testCCOpenCalendar2(self):
-    self.actualTestCCOpen("Sunbird", ["other-licenses", "branding", "sunbird", "test"])
+    self.actualTestCCOpen("Calendar1.0", ["other-licenses", "branding", "sunbird", "test"])
 
   def actualTestCCClosed(self, treeName, fileInfo):
     """Pushing to a CLOSED Thunderbird tree should fail."""
     # If this tests attempts to pull something that isn't treeName, then the
     # re-director should fail for us. Hence we know that the hook is only
     # pulling the predefined tree and nothing else.
     self.redirect("http://tinderbox.mozilla.org/" + treeName + "/status.html",
                          '<span id="tree-status">CLOSED</span><span id="extended-status">')
@@ -412,102 +412,102 @@ 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("Thunderbird", ["testfile"])
+    self.actualTestCCClosed("Miramar", ["testfile"])
 
   def testCCClosedSeaMonkey(self):
-    self.actualTestCCClosed("SeaMonkey", ["suite", "build", "test"])
+    self.actualTestCCClosed("SeaMonkey2.1", ["suite", "build", "test"])
 
   def testCCClosedCalendar1(self):
-    self.actualTestCCClosed("Sunbird", ["calendar", "app", "test"])
+    self.actualTestCCClosed("Calendar1.0", ["calendar", "app", "test"])
 
   def testCCClosedCalendar2(self):
-    self.actualTestCCClosed("Sunbird", ["other-licenses", "branding", "sunbird", "test"])
+    self.actualTestCCClosed("Calendar1.0", ["other-licenses", "branding", "sunbird", "test"])
 
   # 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/Thunderbird/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Miramar/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/Thunderbird/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Miramar/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/Thunderbird/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Miramar/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/Thunderbird/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Miramar/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/Thunderbird/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Miramar/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/Thunderbird/status.html",
+    self.redirect("http://tinderbox.mozilla.org/Miramar/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")