Roll version of gsutil to 4.15.

third_party/gsutil/gslib/tests/test_mv.py

 # -*- coding: utf-8 -*-
 # Copyright 2013 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Integration tests for mv command."""
 
 from __future__ import absolute_import
 
 import os
 
 import gslib.tests.testcase as testcase
 from gslib.tests.util import ObjectToURI as suri
-from gslib.tests.util import PerformsFileToObjectUpload
+from gslib.tests.util import SequentialAndParallelTransfer
 from gslib.util import Retry
 
 
 class TestMv(testcase.GsUtilIntegrationTestCase):
   """Integration tests for mv command."""
 
   def test_moving(self):
     """Tests moving two buckets, one with 2 objects and one with 0 objects."""
     bucket1_uri = self.CreateBucket(test_objects=2)
     self.AssertNObjectsInBucket(bucket1_uri, 2)
@@ skipping 36 matching lines @@
     self.AssertNObjectsInBucket(bucket1_uri, 1)
     self.AssertNObjectsInBucket(bucket2_uri, 0)
 
   def test_move_dir_to_bucket(self):
     """Tests moving a local directory to a bucket."""
     bucket_uri = self.CreateBucket()
     dir_to_move = self.CreateTempDir(test_files=2)
     self.RunGsUtil(['mv', dir_to_move, suri(bucket_uri)])
     self.AssertNObjectsInBucket(bucket_uri, 2)
 
-  @PerformsFileToObjectUpload
+  @SequentialAndParallelTransfer
   def test_stdin_args(self):
     """Tests mv with the -I option."""
     tmpdir = self.CreateTempDir()
     fpath1 = self.CreateTempFile(tmpdir=tmpdir, contents='data1')
     fpath2 = self.CreateTempFile(tmpdir=tmpdir, contents='data2')
     bucket_uri = self.CreateBucket()
     self.RunGsUtil(['mv', '-I', suri(bucket_uri)],
                    stdin='\n'.join((fpath1, fpath2)))
 
     # Use @Retry as hedge against bucket listing eventual consistency.
@@ skipping 12 matching lines @@
     object_uri = self.CreateObject(bucket_uri=bucket_uri, contents='data2')
     stderr = self.RunGsUtil(['mv', '-n', fpath1, suri(object_uri)],
                             return_stderr=True)
     # Copy should be skipped and source file should not be removed.
     self.assertIn('Skipping existing item: %s' % suri(object_uri), stderr)
     self.assertNotIn('Removing %s' % suri(fpath1), stderr)
     # Object content should be unchanged.
     contents = self.RunGsUtil(['cat', suri(object_uri)], return_stdout=True)
     self.assertEqual(contents, 'data2')