Added patchset persistence in gcl, this is necessary to implement a presubmit queue.

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium 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 presubmit_support.py and presubmit_canned_checks.py."""
 
 import exceptions
 import random
 import string
@@ skipping 179 matching lines @@
             {'URL': 'svn:/foo/foo/blat.cc'})
     presubmit.gclient.CaptureSVNInfo('binary.dll').AndReturn(
         {'URL': 'svn:/foo/binary.dll'})
     presubmit.gclient.CaptureSVNInfo(notfound).AndReturn({})
     presubmit.gclient.CaptureSVNInfo(flap).AndReturn(
             {'URL': 'svn:/foo/boo/flap.h'})
     presubmit.gcl.ReadFile(blat).AndReturn('boo!\nahh?')
     presubmit.gcl.ReadFile(notfound).AndReturn('look!\nthere?')
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
     change = presubmit.GclChange(ci)
 
     self.failUnless(change.Change() == 'mychange')
     self.failUnless(change.DescriptionText() ==
                     'Hello there\nthis is a change\nand some more regular text')
     self.failUnless(change.FullDescriptionText() ==
                     '\n'.join(description_lines))
 
@@ skipping 47 matching lines @@
   def testExecPresubmitScript(self):
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', 'foo\\blat.cc'],
     ]
     fake_presubmit = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
 
     executer = presubmit.PresubmitExecuter(ci, False)
     self.failIf(executer.ExecPresubmitScript('', fake_presubmit))
     # No error if no on-upload entry point
     self.failIf(executer.ExecPresubmitScript(
       ('def CheckChangeOnCommit(input_api, output_api):\n'
        '  return (output_api.PresubmitError("!!"))\n'),
       fake_presubmit
@@ skipping 48 matching lines @@
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
     root_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     presubmit.os.path.isfile(root_path).AndReturn(True)
     presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
     presubmit.gcl.ReadFile(root_path,
                            'rU').AndReturn(self.presubmit_text)
     presubmit.gcl.ReadFile(haspresubmit_path,
                            'rU').AndReturn(self.presubmit_text)
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
 
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             None))
     self.assertEqual(output.getvalue().count('!!'), 2)
 
   def testDoPresubmitChecksPromptsAfterWarnings(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'NOSUCHKEY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
     for i in range(2):
       presubmit.os.path.isfile(presubmit_path).AndReturn(True)
       presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
       presubmit.gcl.ReadFile(presubmit_path, 'rU'
           ).AndReturn(self.presubmit_text)
       presubmit.gcl.ReadFile(haspresubmit_path, 'rU'
           ).AndReturn(self.presubmit_text)
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('n\n')  # say no to the warning
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             None))
     self.assertEqual(output.getvalue().count('??'), 2)
 
     output = StringIO.StringIO()
@@ skipping 18 matching lines @@
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit',
                              'PRESUBMIT.py')
     presubmit.os.path.isfile(presubmit_path).AndReturn(True)
     presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
     presubmit.gcl.ReadFile(presubmit_path, 'rU').AndReturn(self.presubmit_text)
     presubmit.gcl.ReadFile(haspresubmit_path, 'rU'
         ).AndReturn(self.presubmit_text)
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
     output = StringIO.StringIO()
     input = StringIO.StringIO()  # should be unused
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             None))
     self.assertEqual(output.getvalue().count('??'), 2)
     self.assertEqual(output.getvalue().count('XX!!XX'), 2)
     self.assertEqual(output.getvalue().count('(y/N)'), 0)
 
@@ skipping 11 matching lines @@
 def CheckChangeOnCommit(input_api, output_api):
   raise Exception("Test error")
 """
     presubmit.os.path.isfile(join(self.fake_root_dir, 'PRESUBMIT.py')
         ).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir,
                                   'haspresubmit',
                                   'PRESUBMIT.py')).AndReturn(False)
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
 
     
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
     # Always fail.
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             DEFAULT_SCRIPT))
     self.assertEquals(output.getvalue().count('!!'), 1)
 
   def testDirectoryHandling(self):
     files = [
       ['A', 'isdir'],
       ['A', 'isdir\\blat.cc'],
     ]
     presubmit.os.path.exists('isdir').AndReturn(True)
     presubmit.os.path.isdir('isdir').AndReturn(True)
     presubmit.os.path.exists(presubmit.os.path.join('isdir', 'blat.cc')
         ).AndReturn(True)
     presubmit.os.path.isdir(presubmit.os.path.join('isdir', 'blat.cc')
         ).AndReturn(False)
     self.mox.ReplayAll()
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
-                                  description='foo',
-                                  files=files)
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
+                                  description='foo', files=files)
     change = presubmit.GclChange(ci)
 
     affected_files = change.AffectedFiles(include_dirs=False)
     self.failUnless(len(affected_files) == 1)
     self.failUnless(affected_files[0].LocalPath().endswith('blat.cc'))
     affected_files_and_dirs = change.AffectedFiles(include_dirs=True)
     self.failUnless(len(affected_files_and_dirs) == 2)
 
   def testTags(self):
     DEFAULT_SCRIPT = """
@@ skipping 12 matching lines @@
    return [output_api.PresubmitError('Tag parsing failed. 5 ' +
                                      input_api.change.FullDescriptionText())]
  return [output_api.PresubmitNotifyResult(input_api.change.tags['STORY'])]
 def CheckChangeOnCommit(input_api, output_api):
   raise Exception("Test error")
 """
     self.mox.ReplayAll()
 
     change = presubmit.gcl.ChangeInfo(
         name='foo',
-        description="Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n")
+        issue=0,
+        patchset=0,
+        description="Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n",
+        files=None)
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
     self.failUnless(presubmit.DoPresubmitChecks(change, False, True, output,
                                                 input, DEFAULT_SCRIPT))
     self.assertEquals(output.getvalue(),
                       ('Warning, no presubmit.py found.\n'
                        'Running default presubmit script.\n\n'
                        '** Presubmit Messages **\n\n'
                        'http://tracker.com/42\n\n'))
 
@@ skipping 72 matching lines @@
     presubmit.os.path.exists(flap).AndReturn(True)
     presubmit.os.path.isdir(flap).AndReturn(False)
     presubmit.gclient.CaptureSVNInfo(beingdeleted).AndReturn({})
     presubmit.gclient.CaptureSVNInfo(notfound).AndReturn({})
     presubmit.gcl.GetSVNFileProperty(blat, 'svn:mime-type').AndReturn(None)
     presubmit.gcl.GetSVNFileProperty(binary, 'svn:mime-type').AndReturn(
         'application/octet-stream')
     presubmit.gcl.ReadFile(blat).AndReturn('whatever\ncookie')
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange',
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
                                   description='\n'.join(description_lines),
                                   files=files)
     change = presubmit.GclChange(ci)
     api = presubmit.InputApi(change, 'foo/PRESUBMIT.py')
     affected_files = api.AffectedFiles()
     self.assertEquals(len(affected_files), 3)
     self.assertEquals(affected_files[0].LocalPath(),
                       presubmit.normpath('foo/blat.cc'))
     self.assertEquals(affected_files[1].LocalPath(),
                       presubmit.normpath('foo/blat/binary.dll'))
@@ skipping 14 matching lines @@
     # from the client root (e.g. if you were at 'src' and did 'cd base' before
     # invoking 'gcl upload' it would fail because svn wouldn't find the files
     # the presubmit script was asking about).
     files = [
       ['A', 'isdir'],
       ['A', join('isdir', 'blat.cc')],
       ['M', join('elsewhere', 'ouf.cc')],
     ]
     self.mox.ReplayAll()
 
-    ci = presubmit.gcl.ChangeInfo(name='mychange', description='', files=files)
+    ci = presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
+                                  description='', files=files)
     # It doesn't make sense on non-Windows platform. This is somewhat hacky,
     # but it is needed since we can't just use os.path.join('c:', 'temp').
     change = presubmit.GclChange(ci, self.fake_root_dir)
     affected_files = change.AffectedFiles(include_dirs=True)
     # Local paths should remain the same
     self.assertEquals(affected_files[0].LocalPath(), normpath('isdir'))
     self.assertEquals(affected_files[1].LocalPath(), normpath('isdir/blat.cc'))
     # Absolute paths should be prefixed
     self.assertEquals(affected_files[0].AbsoluteLocalPath(),
                       normpath(join(self.fake_root_dir, 'isdir')))
@@ skipping 11 matching lines @@
       self.assertEqual(absolute_paths[0],
                        normpath(join(self.fake_root_dir, 'isdir')))
       self.assertEqual(absolute_paths[1],
                        normpath(join(self.fake_root_dir, 'isdir', 'blat.cc')))
 
   def testDeprecated(self):
     presubmit.warnings.warn(mox.IgnoreArg(), category=mox.IgnoreArg(),
                             stacklevel=2)
     self.mox.ReplayAll()
     change = presubmit.GclChange(
-        presubmit.gcl.ChangeInfo(name='mychange', description='Bleh\n'))
+        presubmit.gcl.ChangeInfo(name='mychange', issue=0, patchset=0,
+                                 description='Bleh\n', files=None))
     api = presubmit.InputApi(change, 'foo/PRESUBMIT.py')
     api.AffectedTextFiles(include_deletes=False)
 
 
 class OuputApiUnittest(PresubmitTestsBase):
   """Tests presubmit.OutputApi."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
       'MailTextResult', 'PresubmitError', 'PresubmitNotifyResult',
@@ skipping 117 matching lines @@
     presubmit.gcl.GetSVNFileProperty(blat, 'svn:mime-type').AndReturn(None)
     presubmit.gcl.GetSVNFileProperty(blob, 'svn:mime-type'
         ).AndReturn('application/octet-stream')
     self.mox.ReplayAll()
 
     output = filter(lambda x: x.IsTextFile(), list)
     self.failUnless(len(output) == 1)
     self.failUnless(list[0] == output[0])
 
 
+class GclChangeUnittest(PresubmitTestsBase):
+  def testMembersChanged(self):
+    self.mox.ReplayAll()
+    members = [
+        'AbsoluteLocalPaths', 'AffectedFiles', 'AffectedTextFiles', 'Change',
+        'DescriptionText', 'FullDescriptionText', 'LocalPaths',
+        'RepositoryRoot', 'RightHandSideLines', 'ServerPaths',
+        'issue', 'patchset', 'tags',
+    ]
+    # If this test fails, you should add the relevant test.
+    ci = presubmit.gcl.ChangeInfo('', 0, 0, '', None)
+    self.compareMembers(presubmit.GclChange(ci, self.fake_root_dir), members)
+
+
 class CannedChecksUnittest(PresubmitTestsBase):
   """Tests presubmit_canned_checks.py."""
 
   def setUp(self):
     PresubmitTestsBase.setUp(self)
     self.mox.StubOutWithMock(presubmit_canned_checks,
                          '_RunPythonUnitTests_LoadTests')
 
   def MockInputApi(self):
     input_api = self.mox.CreateMock(presubmit.InputApi)
     input_api.re = presubmit.re
     input_api.urllib2 = self.mox.CreateMock(presubmit.urllib2)
     input_api.unittest = unittest
     return input_api
 
   def MakeBasicChange(self, name, description):
-    ci = presubmit.gcl.ChangeInfo(name=name, description=description)
+    ci = presubmit.gcl.ChangeInfo(name, 0, 0, description, None)
     return presubmit.GclChange(ci, self.fake_root_dir)
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
       'CheckChangeHasBugField', 'CheckChangeHasNoTabs',
       'CheckChangeHasQaField', 'CheckChangeHasTestedField',
       'CheckChangeHasTestField', 'CheckDoNotSubmit',
       'CheckDoNotSubmitInDescription', 'CheckDoNotSubmitInFiles',
       'CheckLongLines', 'CheckTreeIsOpen', 'RunPythonUnitTests',
@@ skipping 172 matching lines @@
     test_result.errors = 0
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 0)
 
 
 if __name__ == '__main__':
   unittest.main()