Retrieve current version from trunk branch in push-to-trunk.

tools/push-to-trunk/test_scripts.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 276 matching lines @@
                              % (self._name, self._index, len(self._recipe)))
 
 
 class ScriptTest(unittest.TestCase):
   def MakeEmptyTempFile(self):
     handle, name = tempfile.mkstemp()
     os.close(handle)
     self._tmp_files.append(name)
     return name
 
-  def WriteFakeVersionFile(self):
+  def WriteFakeVersionFile(self, build=4):
     with open(TEST_CONFIG[VERSION_FILE], "w") as f:
       f.write("  // Some line...\n")
       f.write("\n")
       f.write("#define MAJOR_VERSION    3\n")
       f.write("#define MINOR_VERSION    22\n")
-      f.write("#define BUILD_NUMBER     5\n")
+      f.write("#define BUILD_NUMBER     %s\n" % build)
       f.write("#define PATCH_LEVEL      0\n")
       f.write("  // Some line...\n")
       f.write("#define IS_CANDIDATE_VERSION 0\n")
 
   def MakeStep(self):
     """Convenience wrapper."""
     options = ScriptsBase(TEST_CONFIG, self, self._state).MakeOptions([])
     return MakeStep(step_class=Step, state=self._state,
                     config=TEST_CONFIG, side_effect_handler=self,
                     options=options)
@@ skipping 119 matching lines @@
     self.assertRaises(Exception, self.MakeStep().PrepareBranch)
     self.assertEquals("some_branch", self._state["current_branch"])
 
   def testInitialEnvironmentChecks(self):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     os.environ["EDITOR"] = "vi"
     self.MakeStep().InitialEnvironmentChecks()
 
   def testReadAndPersistVersion(self):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
-    self.WriteFakeVersionFile()
+    self.WriteFakeVersionFile(build=5)
     step = self.MakeStep()
     step.ReadAndPersistVersion()
     self.assertEquals("3", step["major"])
     self.assertEquals("22", step["minor"])
     self.assertEquals("5", step["build"])
     self.assertEquals("0", step["patch"])
 
   def testRegex(self):
     self.assertEqual("(issue 321)",
                      re.sub(r"BUG=v8:(.*)$", r"(issue \1)", "BUG=v8:321"))
@@ skipping 38 matching lines @@
       Git("log -1 --format=%an rev4", "author4@chromium.org"),
     ])
 
     # The cl for rev4 on rietveld has an updated LOG flag.
     self.ExpectReadURL([
       URL("https://codereview.chromium.org/9876543210/description",
           "Title\n\nBUG=456\nLOG=N\n\n"),
     ])
 
     self._state["last_push_bleeding_edge"] = "1234"
+    self._state["version"] = "3.22.5"
     self.RunStep(PushToTrunk, PrepareChangeLog)
 
     actual_cl = FileToText(TEST_CONFIG[CHANGELOG_ENTRY_FILE])
 
     expected_cl = """1999-07-31: Version 3.22.5
 
         Title text 1.
 
         Title text 3 (Chromium issue 321).
 
@@ skipping 11 matching lines @@
 #
 #       Title text 3 (Chromium issue 321).
 #       (author3@chromium.org)
 #
 #       Title text 4 (Chromium issue 456).
 #       (author4@chromium.org)
 #
 #"""
 
     self.assertEquals(expected_cl, actual_cl)
-    self.assertEquals("3", self._state["major"])
-    self.assertEquals("22", self._state["minor"])
-    self.assertEquals("5", self._state["build"])
-    self.assertEquals("0", self._state["patch"])
 
   def testEditChangeLog(self):
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
     TextToFile("  New  \n\tLines  \n", TEST_CONFIG[CHANGELOG_ENTRY_FILE])
     os.environ["EDITOR"] = "vi"
 
     self.ExpectReadline([
       RL(""),  # Open editor.
     ])
 
     self.RunStep(PushToTrunk, EditChangeLog)
 
     self.assertEquals("New\n        Lines",
                       FileToText(TEST_CONFIG[CHANGELOG_ENTRY_FILE]))
 
   def testIncrementVersion(self):
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
-    self._state["build"] = "5"
+    self._state["last_push_trunk"] = "hash1"
+
+    self.ExpectGit([
+      Git("checkout -f hash1 -- %s" % TEST_CONFIG[VERSION_FILE], "")
+    ])
 
     self.ExpectReadline([
       RL("Y"),  # Increment build number.
     ])
 
     self.RunStep(PushToTrunk, IncrementVersion)
 
     self.assertEquals("3", self._state["new_major"])
     self.assertEquals("22", self._state["new_minor"])
-    self.assertEquals("6", self._state["new_build"])
+    self.assertEquals("5", self._state["new_build"])
     self.assertEquals("0", self._state["new_patch"])
 
   def _TestSquashCommits(self, change_log, expected_msg):
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
     with open(TEST_CONFIG[CHANGELOG_ENTRY_FILE], "w") as f:
       f.write(change_log)
 
     self.ExpectGit([
       Git("diff svn/trunk hash1", "patch content"),
       Git("svn find-rev hash1", "123455\n"),
@@ skipping 36 matching lines @@
 Performance and stability improvements on all platforms."""
     self._TestSquashCommits(change_log, commit_msg)
 
   def testSquashCommitsQuotationMarks(self):
     change_log = """Line with "quotation marks".\n"""
     commit_msg = """Line with "quotation marks"."""
     self._TestSquashCommits(change_log, commit_msg)
 
   def _PushToTrunk(self, force=False, manual=False):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
+
+    # The version file on bleeding edge has build level 5, while the version
+    # file from trunk has build level 4.
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
-    self.WriteFakeVersionFile()
+    self.WriteFakeVersionFile(build=5)
+
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
     TEST_CONFIG[CHANGELOG_FILE] = self.MakeEmptyTempFile()
     if not os.path.exists(TEST_CONFIG[CHROMIUM]):
       os.makedirs(TEST_CONFIG[CHROMIUM])
     bleeding_edge_change_log = "2014-03-17: Sentinel\n"
     TextToFile(bleeding_edge_change_log, TEST_CONFIG[CHANGELOG_FILE])
     TextToFile("Some line\n   \"v8_revision\": \"123444\",\n  some line",
                  TEST_CONFIG[DEPS_FILE])
     os.environ["EDITOR"] = "vi"
 
@@ skipping 57 matching lines @@
       Git("branch", "  branch1\n* branch2\n"),
       Git("branch", "  branch1\n* branch2\n"),
       Git("checkout -b %s svn/bleeding_edge" % TEST_CONFIG[BRANCHNAME], ""),
       Git(("log -1 --format=%H --grep="
            "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" "
            "svn/trunk"), "hash2\n"),
       Git("log -1 hash2", "Log message\n"),
       Git("log -1 --format=%s hash2",
        "Version 3.4.5 (based on bleeding_edge revision r1234)\n"),
       Git("svn find-rev r1234", "hash3\n"),
+      Git("checkout -f hash2 -- %s" % TEST_CONFIG[VERSION_FILE], "",
+          cb=self.WriteFakeVersionFile),
       Git("log --format=%H hash3..HEAD", "rev1\n"),
       Git("log -1 --format=%s rev1", "Log text 1.\n"),
       Git("log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"),
       Git("log -1 --format=%an rev1", "author1@chromium.org\n"),
       Git(("commit -am \"Prepare push to trunk.  "
            "Now working on version 3.22.6.%s\"" % review_suffix),
           " 2 files changed\n",
           cb=CheckPreparePush),
       Git(("cl upload --send-mail --email \"author@chromium.org\" "
            "-r \"reviewer@chromium.org\"%s" % force_flag),
@@ skipping 168 matching lines @@
     ])
 
     def RunAutoRoll():
       auto_roll.AutoRoll(TEST_CONFIG, self).Run(AUTO_ROLL_ARGS)
     self.assertRaises(Exception, RunAutoRoll)
 
   def testMergeToBranch(self):
     TEST_CONFIG[ALREADY_MERGING_SENTINEL_FILE] = self.MakeEmptyTempFile()
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
-    self.WriteFakeVersionFile()
+    self.WriteFakeVersionFile(build=5)
     os.environ["EDITOR"] = "vi"
     extra_patch = self.MakeEmptyTempFile()
 
     def VerifyPatch(patch):
       return lambda: self.assertEquals(patch,
           FileToText(TEST_CONFIG[TEMPORARY_PATCH_FILE]))
 
     msg = """Merged r12345, r23456, r34567, r45678, r56789 into trunk branch.
 
 Title4
@@ skipping 125 matching lines @@
 
 Review URL: https://codereview.chromium.org/83173002
 
 ------------------------------------------------------------------------""")
     self.assertEquals(
 """Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)