Update checked in version of gsutil to version 4.6

gslib/tests/test_compose.py

Index: gslib/tests/test_compose.py
===================================================================
--- gslib/tests/test_compose.py	(revision 33376)
+++ gslib/tests/test_compose.py	(working copy)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2013 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,20 +12,22 @@
 # 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.
+"""Tests for compose command."""
 
-import gslib.tests.testcase as testcase
+from __future__ import absolute_import
 
 from gslib.commands.compose import MAX_COMPOSE_ARITY
-from gslib.tests.util import HAS_S3_CREDS
+import gslib.tests.testcase as testcase
+from gslib.tests.testcase.integration_testcase import SkipForS3
 from gslib.tests.util import ObjectToURI as suri
-from gslib.tests.util import unittest
 
 
+@SkipForS3('S3 does not support object composition.')
 class TestCompose(testcase.GsUtilIntegrationTestCase):
   """Integration tests for compose command."""
 
   def check_n_ary_compose(self, num_components):
-    num_components = 2
+    """Tests composing num_components object."""
     bucket_uri = self.CreateBucket()
 
     data_list = ['data-%d,' % i for i in xrange(num_components)]
@@ -46,7 +49,7 @@
     stderr = self.RunGsUtil(
         ['compose', 'gs://b/component-obj', 'gs://b/composite-obj'],
         expected_status=1, return_stderr=True)
-    self.assertEquals(
+    self.assertIn(
         'CommandException: "compose" requires at least 2 component objects.\n',
         stderr)
 
@@ -57,36 +60,19 @@
     stderr = self.RunGsUtil(['compose'] + components + [target],
                             expected_status=1, return_stderr=True)
     expected_msg = (
-        'Composing gs://b/composite-obj from 2 component objects.\n'
-        'BotoClientError: GCS does not support inter-bucket composing.\n')
-    self.assertEquals(expected_msg, stderr)
+        'CommandException: GCS does '
+        'not support inter-bucket composing.\n')
+    self.assertIn(expected_msg, stderr)
 
-  @unittest.skipUnless(HAS_S3_CREDS, 'Test requires S3 credentials.')
-  def test_compose_non_gcs_target(self):
-    stderr = self.RunGsUtil(['compose', 'gs://b/o1', 'gs://b/o2', 's3://b/o3'],
-                            expected_status=1, return_stderr=True)
-    expected_msg = ('CommandException: "compose" called on URI with '
-                    'unsupported provider (%s).\n' % 's3://b/o3')
-    self.assertEquals(expected_msg, stderr)
-
-  @unittest.skipUnless(HAS_S3_CREDS, 'Test requires S3 credentials.')
-  def test_compose_non_gcs_component(self):
-    stderr = self.RunGsUtil(['compose', 'gs://b/o1', 's3://b/o2', 'gs://b/o3'],
-                            expected_status=1, return_stderr=True)
-    expected_msg = ('CommandException: "compose" called on URI with '
-                    'unsupported provider (%s).\n' % 's3://b/o2')
-    self.assertEquals(expected_msg, stderr)
-
   def test_versioned_target_disallowed(self):
     stderr = self.RunGsUtil(
         ['compose', 'gs://b/o1', 'gs://b/o2', 'gs://b/o3#1234'],
         expected_status=1, return_stderr=True)
-    expected_msg = ('CommandException: A version-specific URI\n(%s)\n'
-                    'cannot be the destination for gsutil compose - abort.\n'
+    expected_msg = ('CommandException: A version-specific URL (%s) '
+                    'cannot be the destination for gsutil compose - abort.'
                     % 'gs://b/o3#1234')
-    self.assertEquals(expected_msg, stderr)
+    self.assertIn(expected_msg, stderr)
 
-
   def test_simple_compose(self):
     self.check_n_ary_compose(2)
 
@@ -94,6 +80,7 @@
     self.check_n_ary_compose(MAX_COMPOSE_ARITY)
 
   def test_compose_with_wildcard(self):
+    """Tests composing objects with a wildcarded URI."""
     bucket_uri = self.CreateBucket()
 
     component1 = self.CreateObject(
@@ -105,3 +92,40 @@
 
     self.RunGsUtil(['compose', component1.uri, component2.uri, composite.uri])
     self.assertEqual(composite.get_contents_as_string(), 'hello world!')
+
+  def test_compose_with_precondition(self):
+    """Tests composing objects with a destination precondition."""
+    # Tests that cp -v option handles the if-generation-match header correctly.
+    bucket_uri = self.CreateVersionedBucket()
+    k1_uri = self.CreateObject(bucket_uri=bucket_uri, contents='data1')
+    k2_uri = self.CreateObject(bucket_uri=bucket_uri, contents='data2')
+    g1 = k1_uri.generation
+
+    gen_match_header = 'x-goog-if-generation-match:%s' % g1
+    # Append object 1 and 2
+    self.RunGsUtil(['-h', gen_match_header, 'compose', suri(k1_uri),
+                    suri(k2_uri), suri(k1_uri)])
+
+    # Second compose should fail the precondition.
+    stderr = self.RunGsUtil(['-h', gen_match_header, 'compose', suri(k1_uri),
+                             suri(k2_uri), suri(k1_uri)],
+                            return_stderr=True, expected_status=1)
+
+    self.assertIn('PreconditionException', stderr)
+
+
+class TestCompatibleCompose(testcase.GsUtilIntegrationTestCase):
+  def test_compose_non_gcs_target(self):
+    stderr = self.RunGsUtil(['compose', 'gs://b/o1', 'gs://b/o2', 's3://b/o3'],
+                            expected_status=1, return_stderr=True)
+    expected_msg = ('CommandException: "compose" called on URL with '
+                    'unsupported provider (%s).\n' % 's3://b/o3')
+    self.assertIn(expected_msg, stderr)
+
+  def test_compose_non_gcs_component(self):
+    stderr = self.RunGsUtil(['compose', 'gs://b/o1', 's3://b/o2', 'gs://b/o3'],
+                            expected_status=1, return_stderr=True)
+    expected_msg = ('CommandException: "compose" called on URL with '
+                    'unsupported provider (%s).\n' % 's3://b/o2')
+    self.assertIn(expected_msg, stderr)
+