Upload retry summary to desired location instead of uploading then moving.

scripts/slave/unittests/slave_utils_test.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 import os
 import sys
 import unittest
 
 import test_env  # pylint: disable=W0403,W0611
@@ skipping 96 matching lines @@
     self.assertTrue(build_revision > 0)
     self.assertTrue(webkit_revision > 0)
 
   def testRevisionDir(self):
     (build_revision, webkit_revision) = slave_utils.GetBuildRevisions(
         _BUILD_DIR, revision_dir=_BUILD_DIR)
     self.assertTrue(build_revision > 0)
     self.assertEquals(None, webkit_revision)
 
 
+@mock.patch('__main__.slave_utils.GSUtilSetup',
+            mock.MagicMock(return_value='/mock/gsutil'))
+@mock.patch('__main__.chromium_utils.RunCommand')
 class TestGSUtil(unittest.TestCase):
-  @mock.patch('__main__.slave_utils.GSUtilSetup', return_value='/mock/gsutil')
-  @mock.patch('__main__.chromium_utils.RunCommand')
+
   def testGSUtilCopyCacheControl(self, # pylint: disable=R0201
-                                 run_command_mock, gs_util_setup_mock):
-    slave_utils.GSUtilCopyFile('foo', 'bar',
-      cache_control='mock_cache')
-    run_command_mock.assert_called_with(['/mock/gsutil', '-h',
-      'Cache-Control:mock_cache', 'cp', 'file://foo',
-      'file://bar/foo'])
-    slave_utils.GSUtilCopyDir('foo', 'bar',
-      cache_control='mock_cache')
-    run_command_mock.assert_called_with(['/mock/gsutil', '-m', '-h',
-      'Cache-Control:mock_cache', 'cp', '-R', 'foo', 'bar'])
+                                 run_command_mock):
+    slave_utils.GSUtilCopyFile('foo', 'bar', cache_control='mock_cache')
+    run_command_mock.assert_called_with([
+      '/mock/gsutil',
+      '-h',
+      'Cache-Control:mock_cache',
+      'cp',
+      'file://foo',
+      'file://bar/foo',
+    ])
+    slave_utils.GSUtilCopyDir('foo', 'bar', cache_control='mock_cache')
+    run_command_mock.assert_called_with([
+      '/mock/gsutil',
+      '-m',
+      '-h',
+      'Cache-Control:mock_cache',
+      'cp',
+      '-R',
+      'foo',
+      'bar',
+    ])
+
+  def testGSUtilCopyFileWithDestFilename(self, # pylint: disable=R0201
+                                         run_command_mock):
+    slave_utils.GSUtilCopyFile(
+        '/my/local/path/foo.txt', 'gs://bucket/dest/dir',
+        dest_filename='bar.txt')
+    run_command_mock.assert_called_with([
+      '/mock/gsutil',
+      'cp',
+      'file:///my/local/path/foo.txt',
+      'gs://bucket/dest/dir/bar.txt',
+    ])
 
 
 class GetGitRevisionTest(unittest.TestCase):
   """Tests related to getting revisions from a directory."""
   def test_GitSvnCase(self):
     # pylint: disable=W0212
     self.assertEqual(slave_utils._GetGitCommitPositionFromLog(CHROMIUM_LOG),
                      '291141')
     # pylint: disable=W0212
     self.assertEqual(slave_utils._GetGitCommitPositionFromLog(BLINK_LOG),
@@ skipping 20 matching lines @@
     versions = slave_utils.GetPerfDashboardRevisions(
         build_properties, revision,  webkit_revision, point_id)
     self.assertEqual(
         {'rev': '294850', 'webkit_rev': '34f9d01', 'git_revision': '9a7b354',
          'point_id': 1470050195},
         versions)
 
 
 if __name__ == '__main__':
   unittest.main()