git_cl: Add the ability to set the description. (reland)

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 git_cl.py."""
 
 import os
 import StringIO
 import stat
 import sys
 import unittest
 import urlparse
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.auto_stub import TestCase
 
 import git_cl
 import git_common
 import git_footers
 import subprocess2
 
+class ChangelistMock(object):
+  # A class variable so we can access it when we don't have access to the
+  # instance that's being set.
+  desc = ""
+  def __init__(self, **kwargs):
+    pass
+  def GetIssue(self):
+    return 1
+  def GetDescription(self):
+    return ChangelistMock.desc
+  def UpdateDescription(self, desc):
+    ChangelistMock.desc = desc
+
 class PresubmitMock(object):
   def __init__(self, *args, **kwargs):
     self.reviewers = []
   @staticmethod
   def should_continue():
     return True
 
 
 class RietveldMock(object):
   def __init__(self, *args, **kwargs):
@@ skipping 1344 matching lines @@
     ]
     # TODO(tandrii): consider testing just set-commit and set-commit --clear,
     # but without copy-pasting tons of expectations, as modifying them later is
     # super tedious.
     self.assertEqual(0, git_cl.main(['set-commit', '-d']))
 
   def test_description_display(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stdout', out)
 
-    class MockChangelist():
-      def __init__(self, **kwargs):
-        pass
-      def GetIssue(self):
-        return 1
-      def GetDescription(self):
-        return 'foo'
-
-    self.mock(git_cl, 'Changelist', MockChangelist)
+    self.mock(git_cl, 'Changelist', ChangelistMock)
+    ChangelistMock.desc = 'foo\n'
 
     self.assertEqual(0, git_cl.main(['description', '-d']))
     self.assertEqual('foo\n', out.getvalue())
 
   def test_description_rietveld(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stdout', out)
     self.mock(git_cl.Changelist, 'GetDescription',
               lambda *args: 'foobar')
 
     self.calls = [
         ((['git', 'config', 'rietveld.autoupdate'],), ''),
         ((['git', 'config', 'rietveld.server'],), ''),
         ((['git', 'config', 'rietveld.server'],), ''),
     ]
     self.assertEqual(0, git_cl.main([
         'description', 'https://code.review.org/123123', '-d', '--rietveld']))
     self.assertEqual('foobar\n', out.getvalue())
 
   def test_description_gerrit(self):
     out = StringIO.StringIO()
     self.mock(git_cl.sys, 'stdout', out)
     self.mock(git_cl.Changelist, 'GetDescription',
               lambda *args: 'foobar')
 
     self.assertEqual(0, git_cl.main([
         'description', 'https://code.review.org/123123', '-d', '--gerrit']))
     self.assertEqual('foobar\n', out.getvalue())
 
+  def test_description_set_raw(self):
+    out = StringIO.StringIO()
+    self.mock(git_cl.sys, 'stdout', out)
+
+    self.mock(git_cl, 'Changelist', ChangelistMock)
+    self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hihi'))
+
+    self.assertEqual(0, git_cl.main(['description', '-n', 'hihi']))
+    self.assertEqual('hihi', ChangelistMock.desc)
+
+  def test_description_set_stdin(self):
+    out = StringIO.StringIO()
+    self.mock(git_cl.sys, 'stdout', out)
+
+    self.mock(git_cl, 'Changelist', ChangelistMock)
+    self.mock(git_cl.sys, 'stdin', StringIO.StringIO('hi \r\n\t there\n\nman'))
+
+    self.assertEqual(0, git_cl.main(['description', '-n', '-']))
+    self.assertEqual('hi\n\t there\n\nman', ChangelistMock.desc)
+
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()