Update upload.py @827fa087f74d, which includes support for svn 1.7

tests/gcl_unittest.py

Index: tests/gcl_unittest.py
diff --git a/tests/gcl_unittest.py b/tests/gcl_unittest.py
index 4ea69b446382d8afc5eb7ddf421e54d80f7f77b7..a6f25ebabd7ad07ec63f13d4658aa291c9fae2e1 100755
--- a/tests/gcl_unittest.py
+++ b/tests/gcl_unittest.py
@@ -187,7 +187,6 @@ class ChangeInfoUnittest(GclTestsBase):
       'UpdateRietveldDescription',
       'description', 'issue', 'name',
       'needs_upload', 'patch', 'patchset', 'reviewers', 'rietveld',
-      'subject',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(
@@ -312,10 +311,10 @@ class CMDuploadUnittest(GclTestsBase):
     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',
-                         '--message=\'\'', '--issue=1'],
-                         change_info.patch).AndReturn(("1",
+    gcl.upload.RealMain(
+        [ 'upload.py', '-y', '--server=https://my_server',
+          '-r', 'georges@example.com', '--issue=1'],
+        change_info.patch).AndReturn(("1",
                                                                     "2"))
     change_info.GetLocalRoot().AndReturn('proout')
     change_info.Save()
@@ -358,7 +357,7 @@ class CMDuploadUnittest(GclTestsBase):
     gcl.GenerateDiff(change_info.GetFileNames())
     gcl.upload.RealMain(
         [ 'upload.py', '-y', '--server=https://my_server', '--server=a',
-          '--description_file=descfile', '--message=deescription'],
+          '--file=descfile'],
         change_info.patch).AndReturn(("1", "2"))
     gcl.os.remove('descfile')
     change_info.SendToRietveld("/lint/issue%s_%s" % ('1', '2'), timeout=1)
@@ -398,9 +397,9 @@ class CMDuploadUnittest(GclTestsBase):
     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',
-        "--description_file=descfile",
-        "--message=deescription"], change_info.patch).AndReturn(("1", "2"))
+    gcl.upload.RealMain(
+        ['upload.py', '-y', '--server=https://my_server', "--file=descfile"],
+        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')
@@ -455,10 +454,10 @@ class CMDuploadUnittest(GclTestsBase):
     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',
-                         '--message=\'\'', '--issue=1'],
-                         change_info.patch).AndReturn(("1", "2"))
+    gcl.upload.RealMain(
+        [ 'upload.py', '-y', '--server=https://my_server',
+          '--reviewers=georges@example.com', '--issue=1'],
+        change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
@@ -484,10 +483,10 @@ class CMDuploadUnittest(GclTestsBase):
     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',
-                         '--message=\'\'', '--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', '--issue=1'],
+        change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')