Revert 119066 until we have consensus.

tests/gcl_unittest.py

Index: tests/gcl_unittest.py
===================================================================
--- tests/gcl_unittest.py	(revision 119352)
+++ tests/gcl_unittest.py	(working copy)
@@ -187,6 +187,7 @@
       'UpdateRietveldDescription',
       'description', 'issue', 'name',
       'needs_upload', 'patch', 'patchset', 'reviewers', 'rietveld',
+      'subject',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(
@@ -311,10 +312,10 @@
     gcl.os.chdir('proout')
     change_info.GetFileNames().AndReturn(files)
     gcl.GenerateDiff(files)
-    gcl.upload.RealMain(
-        [ 'upload.py', '-y', '--server=https://my_server',
-          '-r', 'georges@example.com', '--issue=1'],
-        change_info.patch).AndReturn(("1",
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
+                         '-r', 'georges@example.com',
+                         '--message=\'\'', '--issue=1'],
+                         change_info.patch).AndReturn(("1",
                                                                     "2"))
     change_info.GetLocalRoot().AndReturn('proout')
     change_info.Save()
@@ -357,7 +358,7 @@
     gcl.GenerateDiff(change_info.GetFileNames())
     gcl.upload.RealMain(
         [ 'upload.py', '-y', '--server=https://my_server', '--server=a',
-          '--file=descfile'],
+          '--description_file=descfile', '--message=deescription'],
         change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     change_info.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=1)
@@ -397,9 +398,9 @@
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir(change_info.GetLocalRoot())
     gcl.GenerateDiff(change_info.GetFileNames())
-    gcl.upload.RealMain(
-        ['upload.py', '-y', '--server=https://my_server', "--file=descfile"],
-        change_info.patch).AndReturn(("1", "2"))
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
+        "--description_file=descfile",
+        "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     change_info.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=1)
     gcl.os.chdir('somewhere')
@@ -454,10 +455,10 @@
     change_info.GetLocalRoot().AndReturn('proout')
     gcl.os.chdir('proout')
     gcl.GenerateDiff(files)
-    gcl.upload.RealMain(
-        [ 'upload.py', '-y', '--server=https://my_server',
-          '--reviewers=georges@example.com', '--issue=1'],
-        change_info.patch).AndReturn(("1", "2"))
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
+                         '--reviewers=georges@example.com',
+                         '--message=\'\'', '--issue=1'],
+                         change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
@@ -483,10 +484,10 @@
     gcl.os.getcwd().AndReturn('somewhere')
     gcl.os.chdir('proout')
     gcl.GenerateDiff(change_info.GetFileNames())
-    gcl.upload.RealMain(
-        [ 'upload.py', '-y', '--server=https://my_server',
-          '--reviewers=foo@example.com,bar@example.com', '--issue=1'],
-        change_info.patch).AndReturn(("1", "2"))
+    gcl.upload.RealMain(['upload.py', '-y', '--server=https://my_server',
+                         '--reviewers=foo@example.com,bar@example.com',
+                         '--message=\'\'', '--issue=1'],
+                         change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')