Roll version of gsutil to 4.15.

third_party/gsutil/gslib/tests/test_rm.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
@@ skipping 417 matching lines @@
                             expected_status=1)
     self.assertRegexpMatches(
         stderr, r'PreconditionException: 412 Precondition\s*Failed')
 
   def test_stdin_args(self):
     """Tests rm with the -I option."""
     buri1 = self.CreateVersionedBucket()
     ouri1 = self.CreateObject(bucket_uri=buri1,
                               object_name='foo',
                               contents='foocontents')
-    ouri2 = self.CreateObject(bucket_uri=buri1,
-                              object_name='bar',
-                              contents='barcontents')
+    self.CreateObject(bucket_uri=buri1, object_name='bar',
+                      contents='barcontents')
     ouri3 = self.CreateObject(bucket_uri=buri1,
                               object_name='baz',
                               contents='bazcontents')
     buri2 = self.CreateVersionedBucket()
     ouri4 = self.CreateObject(bucket_uri=buri2,
                               object_name='moo',
                               contents='moocontents')
     self.AssertNObjectsInBucket(buri1, 3, versioned=True)
     self.AssertNObjectsInBucket(buri2, 1, versioned=True)
 
     objects_to_remove = ['%s#%s' % (suri(ouri1), urigen(ouri1)),
                          '%s#%s' % (suri(ouri3), urigen(ouri3)),
                          '%s#%s' % (suri(ouri4), urigen(ouri4))]
     stdin = '\n'.join(objects_to_remove)
     self._RunRemoveCommandAndCheck(['rm', '-I'],
                                    objects_to_remove=objects_to_remove,
                                    stdin=stdin)
     self.AssertNObjectsInBucket(buri1, 1, versioned=True)
     self.AssertNObjectsInBucket(buri2, 0, versioned=True)
+
+  def test_rm_nonexistent_bucket_recursive(self):
+    stderr = self.RunGsUtil(
+        ['rm', '-rf', '%s://%s' % (self.default_provider,
+                                   self.nonexistent_bucket_name)],
+        return_stderr=True, expected_status=1)
+    self.assertIn('Encountered non-existent bucket', stderr)
+
+  def test_rm_multiple_nonexistent_objects(self):
+    bucket_uri = self.CreateBucket()
+    nonexistent_object1 = suri(bucket_uri, 'nonexistent1')
+    nonexistent_object2 = suri(bucket_uri, 'nonexistent1')
+    stderr = self.RunGsUtil(
+        ['rm', '-rf', nonexistent_object1, nonexistent_object2],
+        return_stderr=True, expected_status=1)
+    self.assertIn('2 files/objects could not be removed.', stderr)