Add support to pushing unstable changes for the chrome pfq.

bin/cros_mark_chrome_as_stable_unittest.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for cros_mark_chrome_as_stable.py."""
 
 import cros_mark_chrome_as_stable
 import mox
@@ skipping 182 matching lines @@
         ['svn', 'ls', 'http://src.chromium.org/svn/releases'],
         redirect_stdout=True).AndReturn('some_data')
     cros_mark_chrome_as_stable.RunCommand(
         ['sort', '--version-sort'], input='some_data',
         redirect_stdout=True).AndReturn(test_data)
     self.mox.ReplayAll()
     release = cros_mark_chrome_as_stable._GetLatestRelease(self.sticky_branch)
     self.mox.VerifyAll()
     self.assertEqual('8.0.224.2', release)
 
-  def testStickyVersion(self):
-    """Tests if we can find the sticky version from our mock directories."""
+  def testStickyEBuild(self):
+    """Tests if we can find the sticky ebuild from our mock directories."""
     stable_ebuilds = self._GetStableEBuilds()
-    sticky_version = cros_mark_chrome_as_stable._GetStickyVersion(
+    sticky_ebuild = cros_mark_chrome_as_stable._GetStickyEBuild(
         stable_ebuilds)
-    self.assertEqual(sticky_version, self.sticky_version)
+    self.assertEqual(sticky_ebuild.chrome_version, self.sticky_version)
 
   def testChromeEBuildInit(self):
     """Tests if the chrome_version is set correctly in a ChromeEBuild."""
     ebuild = cros_mark_chrome_as_stable.ChromeEBuild(self.sticky)
     self.assertEqual(ebuild.chrome_version, self.sticky_version)
 
   def _CommonMarkAsStableTest(self, chrome_rev, new_version, old_ebuild_path,
                               new_ebuild_path, commit_string_indicator):
     """Common function used for test functions for MarkChromeEBuildAsStable.
 
     This function stubs out others calls, and runs MarkChromeEBuildAsStable
     with the specified args.
 
     Args:
       chrome_rev: standard chrome_rev argument
       new_version: version we are revving up to
       old_ebuild_path: path to the stable ebuild
       new_ebuild_path: path to the to be created path
       commit_string_indicator: a string that the commit message must contain
     """
     self.mox.StubOutWithMock(cros_mark_chrome_as_stable, 'RunCommand')
     self.mox.StubOutWithMock(cros_mark_as_stable.EBuildStableMarker,
                              'CommitChange')
     stable_candidate = cros_mark_chrome_as_stable.ChromeEBuild(old_ebuild_path)
     unstable_ebuild = cros_mark_chrome_as_stable.ChromeEBuild(self.unstable)
+    sticky_ebuild = cros_mark_chrome_as_stable.ChromeEBuild(self.sticky)
     chrome_version = new_version
     commit = None
     overlay_dir = self.mock_chrome_dir
 
     cros_mark_chrome_as_stable.RunCommand(['git', 'add', new_ebuild_path])
     cros_mark_chrome_as_stable.RunCommand(['git', 'rm', old_ebuild_path])
     cros_mark_as_stable.EBuildStableMarker.CommitChange(
         mox.StrContains(commit_string_indicator))
 
     self.mox.ReplayAll()
     cros_mark_chrome_as_stable.MarkChromeEBuildAsStable(
         stable_candidate, unstable_ebuild, chrome_rev, chrome_version, commit,
-        overlay_dir)
+        overlay_dir, sticky_ebuild)
     self.mox.VerifyAll()
 
   def testStickyMarkAsStable(self):
     """Tests to see if we can mark chrome as stable for a new sticky release."""
     self._CommonMarkAsStableTest(cros_mark_chrome_as_stable.STICKY,
                                  self.sticky_new_rc_version, self.sticky_rc,
-                                 self.sticky_new_rc, 'sticky_release')
+                                 self.sticky_new_rc, 'stable_release')
 
   def testLatestMarkAsStable(self):
     """Tests to see if we can mark chrome for a latest release."""
     self._CommonMarkAsStableTest(cros_mark_chrome_as_stable.LATEST_RELEASE,
                                  self.latest_new_version, self.latest_stable,
                                  self.latest_new, 'latest_release')
 
   def testTotMarkAsStable(self):
     """Tests to see if we can mark chrome for tot."""
     self._CommonMarkAsStableTest(cros_mark_chrome_as_stable.TIP_OF_TRUNK,
                                  self.tot_new_version, self.tot_stable,
                                  self.tot_new, 'tot')
 
 
 if __name__ == '__main__':
   unittest.main()