Avoid losing CL description during Rietveld outage....

tests/gcl_unittest.py

 #!/usr/bin/python
 # Copyright (c) 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 gcl.py."""
 
 # Local imports
 import gcl
 from super_mox import mox, SuperMoxTestBase
@@ skipping 142 matching lines @@
 class ChangeInfoUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'GetChangelistInfoFile')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
 
   def testChangeInfoMembers(self):
     self.mox.ReplayAll()
     members = [
       'CloseIssue', 'Delete', 'GetFiles', 'GetFileNames', 'GetLocalRoot',
-      'Exists', 'Load', 'MissingTests', 'Save', 'UpdateRietveldDescription',
-      'description', 'issue', 'name',
-      'patch', 'patchset',
+      'Exists', 'Load', 'MissingTests', 'NeedsUpload', 'Save',
+      'UpdateRietveldDescription', 'description', 'issue', 'name',
+      'needs_upload', 'patch', 'patchset',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir),
                         members)
 
   def testChangeInfoBase(self):
     files = [('M', 'foo'), ('A', 'bar')]
     self.mox.ReplayAll()
     o = gcl.ChangeInfo('name2', '42', '53', 'description2', files,
                        self.fake_root_dir)
     self.assertEquals(o.name, 'name2')
     self.assertEquals(o.issue, 42)
     self.assertEquals(o.patchset, 53)
     self.assertEquals(o.description, 'description2')
     self.assertEquals(o.patch, None)
     self.assertEquals(o.GetFileNames(), ['foo', 'bar'])
     self.assertEquals(o.GetFiles(), files)
     self.assertEquals(o.GetLocalRoot(), self.fake_root_dir)
 
   def testLoadWithIssue(self):
     description = ["This is some description.", "force an extra separator."]
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.ReadFile('bleeeh').AndReturn(
-      gcl.ChangeInfo._SEPARATOR.join(["42,53", "G      b.cc"] + description))
+      gcl.ChangeInfo._SEPARATOR.join(["42, 53", "G      b.cc"] + description))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 42)
     self.assertEquals(change_info.patchset, 53)
     self.assertEquals(change_info.description,
                       gcl.ChangeInfo._SEPARATOR.join(description))
     self.assertEquals(change_info.GetFiles(), [('G      ', 'b.cc')])
 
   def testLoadEmpty(self):
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.ReadFile('bleeeh').AndReturn(
         gcl.ChangeInfo._SEPARATOR.join(["", "", ""]))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 0)
     self.assertEquals(change_info.patchset, 0)
     self.assertEquals(change_info.description, "")
     self.assertEquals(change_info.GetFiles(), [])
 
   def testSaveEmpty(self):
     gcl.GetChangelistInfoFile('').AndReturn('foo')
-    gcl.WriteFile('foo', gcl.ChangeInfo._SEPARATOR.join(['0, 0', '', '']))
+    gcl.WriteFile('foo', gcl.ChangeInfo._SEPARATOR.join(['0, 0, clean', '',
+                                                         '']))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir)
     change_info.Save()
 
+  def testSaveDirty(self):
+    gcl.GetChangelistInfoFile('').AndReturn('foo')
+    gcl.WriteFile('foo', gcl.ChangeInfo._SEPARATOR.join(['0, 0, dirty', '',
+                                                         '']))
+    self.mox.ReplayAll()
+
+    change_info = gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir,
+                                 needs_upload=True)
+    change_info.Save()
+
 
 class UploadCLUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'DoPresubmitChecks')
     self.mox.StubOutWithMock(gcl, 'GenerateDiff')
     self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
     self.mox.StubOutWithMock(gcl, 'SendToRietveld')
     self.mox.StubOutWithMock(gcl, 'TryChange')
@@ skipping 107 matching lines @@
     self.mox.ReplayAll()
 
     gcl.UploadCL(change_info, args)
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()