gcloud 0.0.4 → 0.0.6

data/packages/gsutil/gslib/tests/test_setmeta.py

@@ -0,0 +1,91 @@
+# -*- 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.
+
+import gslib.tests.testcase as testcase
+from gslib.tests.util import ObjectToURI as suri
+
+
+class TestSetMeta(testcase.GsUtilIntegrationTestCase):
+  """Integration tests for setmeta command."""
+
+  def test_initial_metadata(self):
+    objuri = suri(self.CreateObject(contents='foo'))
+    inpath = self.CreateTempFile()
+    ct = 'image/gif'
+    self.RunGsUtil(['-h', 'x-goog-meta-xyz:abc', '-h', 'Content-Type:%s' % ct,
+                    'cp', inpath, objuri])
+    stdout = self.RunGsUtil(['ls', '-L', objuri], return_stdout=True)
+    self.assertIn('Content-Type:\t%s' % ct, stdout)
+    self.assertIn('x-goog-meta-xyz:\tabc', stdout)
+
+  def test_overwrite_existing(self):
+    objuri = suri(self.CreateObject(contents='foo'))
+    inpath = self.CreateTempFile()
+    self.RunGsUtil(['-h', 'x-goog-meta-xyz:abc', '-h', 'Content-Type:image/gif',
+                    'cp', inpath, objuri])
+    self.RunGsUtil(['setmeta', '-n', '-h', 'Content-Type:text/html', '-h',
+                    'x-goog-meta-xyz', objuri])
+    stdout = self.RunGsUtil(['ls', '-L', objuri], return_stdout=True)
+    self.assertIn('Content-Type:\ttext/html', stdout)
+    self.assertNotIn('xyz', stdout)
+
+  def test_missing_header(self):
+    stderr = self.RunGsUtil(['setmeta', '"Content-Type"', 'gs://foo/bar'],
+                            expected_status=1, return_stderr=True)
+    self.assertIn('Fields being added must include values', stderr)
+
+  def test_minus_header_value(self):
+    stderr = self.RunGsUtil(['setmeta', '"-Content-Type:text/html"',
+                             'gs://foo/bar'], expected_status=1,
+                            return_stderr=True)
+    self.assertIn('Removal spec may not contain ":"', stderr)
+
+  def test_plus_and_minus(self):
+    stderr = self.RunGsUtil(['setmeta', ('"Content-Type:text/html",'
+                                         '"-Content-Type"'), 'gs://foo/bar'],
+                            expected_status=1, return_stderr=True)
+    self.assertIn('Each header must appear at most once', stderr)
+
+  def test_non_ascii_custom_header(self):
+    stderr = self.RunGsUtil(['setmeta', '"x-goog-meta-soufflé:5"',
+                             'gs://foo/bar'], expected_status=1,
+                            return_stderr=True)
+    self.assertIn('Invalid non-ASCII header', stderr)
+
+  def test_disallowed_header(self):
+    stderr = self.RunGsUtil(['setmeta', '"Content-Length:5"',
+                             'gs://foo/bar'], expected_status=1,
+                            return_stderr=True)
+    self.assertIn('Invalid or disallowed header', stderr)
+
+  def test_deprecated_syntax(self):
+    objuri = suri(self.CreateObject(contents='foo'))
+    inpath = self.CreateTempFile()
+    self.RunGsUtil(['-h', 'x-goog-meta-xyz:abc', '-h', 'Content-Type:image/gif',
+                    'cp', inpath, objuri])
+
+    stdout = self.RunGsUtil(['ls', '-L', objuri], return_stdout=True)
+    self.assertIn('Content-Type:\timage/gif', stdout)
+    self.assertIn('x-goog-meta-xyz:\tabc', stdout)
+
+    stderr = self.RunGsUtil(
+        ['setmeta', '-n', '"Content-Type:text/html","-x-goog-meta-xyz"',
+         objuri],
+        return_stderr=True)
+    self.assertIn('WARNING: metadata spec syntax', stderr)
+    self.assertIn('is deprecated and will eventually be removed', stderr)
+    stdout = self.RunGsUtil(['ls', '-L', objuri], return_stdout=True)
+    self.assertIn('Content-Type:\ttext/html', stdout)
+    self.assertNotIn('xyz', stdout)

data/packages/gsutil/gslib/tests/test_setversioning.py

@@ -0,0 +1,44 @@
+# 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.
+
+import gslib.tests.testcase as testcase
+from gslib.tests.util import ObjectToURI as suri
+
+
+class TestSetVersioning(testcase.GsUtilIntegrationTestCase):
+  """Integration tests for setversioning command."""
+
+  def test_off_default(self):
+    bucket_uri = self.CreateBucket()
+    stdout = self.RunGsUtil(['getversioning',
+                            suri(bucket_uri)], return_stdout=True)
+    self.assertEqual(stdout.strip(), '%s: Suspended' % suri(bucket_uri))
+
+  def test_turning_on(self):
+    bucket_uri = self.CreateBucket()
+    self.RunGsUtil(['setversioning', 'on', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getversioning',
+                            suri(bucket_uri)], return_stdout=True)
+    self.assertEqual(stdout.strip(), '%s: Enabled' % suri(bucket_uri))
+
+  def test_turning_off(self):
+    bucket_uri = self.CreateBucket()
+    self.RunGsUtil(['setversioning', 'on', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getversioning',
+                            suri(bucket_uri)], return_stdout=True)
+    self.assertEqual(stdout.strip(), '%s: Enabled' % suri(bucket_uri))
+    self.RunGsUtil(['setversioning', 'off', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getversioning',
+                            suri(bucket_uri)], return_stdout=True)
+    self.assertEqual(stdout.strip(), '%s: Suspended' % suri(bucket_uri))

data/packages/gsutil/gslib/tests/test_setwebcfg.py

@@ -0,0 +1,63 @@
+# 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.
+
+from xml.dom.minidom import parseString
+
+import gslib.tests.testcase as testcase
+from gslib.tests.util import ObjectToURI as suri
+
+
+WEBCFG_FULL = parseString(
+    '<WebsiteConfiguration><MainPageSuffix>main'
+    '</MainPageSuffix><NotFoundPage>404</NotFoundPage>'
+    '</WebsiteConfiguration>').toprettyxml()
+
+WEBCFG_MAIN = parseString(
+    '<WebsiteConfiguration>'
+    '<MainPageSuffix>main</MainPageSuffix>'
+    '</WebsiteConfiguration>').toprettyxml()
+
+WEBCFG_ERROR = parseString(
+    '<WebsiteConfiguration><NotFoundPage>'
+    '404</NotFoundPage></WebsiteConfiguration>').toprettyxml()
+
+WEBCFG_EMPTY = parseString('<WebsiteConfiguration/>').toprettyxml()
+
+
+class TestSetWebCfg(testcase.GsUtilIntegrationTestCase):
+  """Integration tests for setwebcfg command."""
+
+  def test_full(self):
+    bucket_uri = self.CreateBucket()
+    self.RunGsUtil(['setwebcfg', '-m', 'main', '-e', '404', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getwebcfg', suri(bucket_uri)], return_stdout=True)
+    self.assertEquals(stdout, WEBCFG_FULL)
+
+  def test_main(self):
+    bucket_uri = self.CreateBucket()
+    self.RunGsUtil(['setwebcfg', '-m', 'main', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getwebcfg', suri(bucket_uri)], return_stdout=True)
+    self.assertEquals(stdout, WEBCFG_MAIN)
+
+  def test_error(self):
+    bucket_uri = self.CreateBucket()
+    self.RunGsUtil(['setwebcfg', '-e', '404', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getwebcfg', suri(bucket_uri)], return_stdout=True)
+    self.assertEquals(stdout, WEBCFG_ERROR)
+
+  def test_empty(self):
+    bucket_uri = self.CreateBucket()
+    self.RunGsUtil(['setwebcfg', suri(bucket_uri)])
+    stdout = self.RunGsUtil(['getwebcfg', suri(bucket_uri)], return_stdout=True)
+    self.assertEquals(stdout, WEBCFG_EMPTY)

data/packages/gsutil/gslib/tests/test_thread_pool.py

@@ -0,0 +1,92 @@
+# Copyright 2011 Google Inc. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish, dis-
+# tribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the fol-
+# lowing conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+"""Unit tests for gsutil thread pool."""
+
+import threading
+
+import gslib.tests.testcase as testcase
+import gslib.thread_pool as thread_pool
+
+
+class GsutilThreadPoolTests(testcase.GsUtilUnitTestCase):
+  """gsutil thread pool test suite."""
+
+  def _TestThreadPool(self, threads):
+    """Tests pool with specified threads from end to end."""
+    pool = thread_pool.ThreadPool(threads)
+
+    self.actual_call_count = 0
+    expected_call_count = 10000
+
+    self.data = xrange(expected_call_count)
+
+    self.actual_result = 0
+    expected_result = sum(self.data)
+
+    stats_lock = threading.Lock()
+
+    def _Dummy(num):
+      stats_lock.acquire()
+      self.actual_call_count += 1
+      self.actual_result += num
+      stats_lock.release()
+
+    for data in xrange(expected_call_count):
+      pool.AddTask(_Dummy, data)
+
+    pool.WaitCompletion()
+    self.assertEqual(self.actual_call_count, expected_call_count)
+
+    self.assertEqual(self.actual_result, expected_result)
+
+    pool.Shutdown()
+    for thread in pool.threads:
+      self.assertFalse(thread.is_alive())
+
+  def testSingleThreadPool(self):
+    """Tests thread pool with a single thread."""
+    self._TestThreadPool(1)
+
+  def testThirtyThreadPool(self):
+    """Tests thread pool with 30 threads."""
+    self._TestThreadPool(30)
+
+  def testThreadPoolExceptionHandler(self):
+    """Tests thread pool with exceptions."""
+    self.exception_raised = False
+
+    def _ExceptionHandler(e):
+      """Verify an exception is raised and that it's the correct one."""
+      self.assertTrue(isinstance(e, TypeError))
+      self.assertEqual(e[0], 'gsutil')
+      self.exception_raised = True
+
+    pool = thread_pool.ThreadPool(1, exception_handler=_ExceptionHandler)
+
+    def _Dummy():
+      raise TypeError('gsutil')
+
+    pool.AddTask(_Dummy)
+    pool.WaitCompletion()
+    pool.Shutdown()
+
+    self.assertTrue(self.exception_raised)

data/packages/gsutil/gslib/tests/test_wildcard_iterator.py

@@ -0,0 +1,364 @@
+# Copyright 2010 Google Inc. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish, dis-
+# tribute, sublicense, and/or sell copies of the Software, and to permit
+# persons to whom the Software is furnished to do so, subject to the fol-
+# lowing conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+"""Unit tests for gslib wildcard_iterator"""
+
+import os.path
+import tempfile
+
+from boto import InvalidUriError
+
+from gslib import wildcard_iterator
+from gslib.project_id import ProjectIdHandler
+import gslib.tests.testcase as testcase
+from gslib.wildcard_iterator import ContainsWildcard
+from gslib.tests.util import ObjectToURI as suri
+
+
+class CloudWildcardIteratorTests(testcase.GsUtilUnitTestCase):
+  """CloudWildcardIterator test suite"""
+
+  def setUp(self):
+    """Creates 2 mock buckets, each containing 4 objects, including 1 nested."""
+    super(CloudWildcardIteratorTests, self).setUp()
+    self.immed_child_obj_names = ['abcd', 'abdd', 'ade$']
+    self.all_obj_names = ['abcd', 'abdd', 'ade$', 'nested1/nested2/xyz1',
+                         'nested1/nested2/xyz2', 'nested1/nfile_abc']
+
+    self.base_bucket_uri = self.CreateBucket()
+    self.prefix_bucket_name = '%s_' % self.base_bucket_uri.bucket_name[:61]
+    self.base_uri_str = suri(self.base_bucket_uri)
+    self.base_uri_str = self.base_uri_str.replace(
+        self.base_bucket_uri.bucket_name, self.prefix_bucket_name)
+
+    self.test_bucket0_uri = self.CreateBucket(
+        bucket_name='%s0' % self.prefix_bucket_name)
+    self.test_bucket0_obj_uri_strs = set()
+    for obj_name in self.all_obj_names:
+      obj_uri = self.CreateObject(bucket_uri=self.test_bucket0_uri,
+                                  object_name=obj_name, contents='')
+      self.test_bucket0_obj_uri_strs.add(suri(obj_uri))
+
+    self.test_bucket1_uri = self.CreateBucket(
+        bucket_name='%s1' % self.prefix_bucket_name)
+    self.test_bucket1_obj_uri_strs = set()
+    for obj_name in self.all_obj_names:
+      obj_uri = self.CreateObject(bucket_uri=self.test_bucket1_uri,
+                                  object_name=obj_name, contents='')
+      self.test_bucket1_obj_uri_strs.add(suri(obj_uri))
+
+  def testNoOpObjectIterator(self):
+    """Tests that bucket-only URI iterates just that one URI"""
+    results = list(
+        self._test_wildcard_iterator(self.test_bucket0_uri).IterUris())
+    self.assertEqual(1, len(results))
+    self.assertEqual(str(self.test_bucket0_uri), str(results[0]))
+
+  def testMatchingAllObjects(self):
+    """Tests matching all objects, based on wildcard"""
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            self.test_bucket0_uri.clone_replace_name('**')).IterUris())
+    self.assertEqual(self.test_bucket0_obj_uri_strs, actual_obj_uri_strs)
+
+  def testMatchingObjectSubset(self):
+    """Tests matching a subset of objects, based on wildcard"""
+    exp_obj_uri_strs = set(
+        [str(self.test_bucket0_uri.clone_replace_name('abcd')),
+         str(self.test_bucket0_uri.clone_replace_name('abdd'))])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            self.test_bucket0_uri.clone_replace_name('ab??')).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testMatchingNonWildcardedUri(self):
+    """Tests matching a single named object"""
+    exp_obj_uri_strs = set([str(self.test_bucket0_uri.clone_replace_name('abcd')
+                               )])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            self.test_bucket0_uri.clone_replace_name('abcd')).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testWildcardedObjectUriWithVsWithoutPrefix(self):
+    """Tests that wildcarding w/ and w/o server prefix get same result"""
+    # (It's just more efficient to query w/o a prefix; wildcard
+    # iterator will filter the matches either way.)
+    with_prefix_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            self.test_bucket0_uri.clone_replace_name('abcd')).IterUris())
+    # By including a wildcard at the start of the string no prefix can be
+    # used in server request.
+    no_prefix_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            self.test_bucket0_uri.clone_replace_name('?bcd')).IterUris())
+    self.assertEqual(with_prefix_uri_strs, no_prefix_uri_strs)
+
+  def testWildcardedObjectUriNestedSubdirMatch(self):
+    """Tests wildcarding with a nested subdir"""
+    uri_strs = set()
+    prefixes = set()
+    for blr in self._test_wildcard_iterator(
+        self.test_bucket0_uri.clone_replace_name('*')):
+      if blr.HasPrefix():
+        prefixes.add(blr.GetPrefix().name)
+      else:
+        uri_strs.add(blr.GetUri().uri)
+    exp_obj_uri_strs = set([suri(self.test_bucket0_uri, x)
+        for x in self.immed_child_obj_names])
+    self.assertEqual(exp_obj_uri_strs, uri_strs)
+    self.assertEqual(1, len(prefixes))
+    self.assertTrue('nested1/' in prefixes)
+
+  def testWildcardedObjectUriNestedSubSubdirMatch(self):
+    """Tests wildcarding with a nested sub-subdir"""
+    for final_char in ('', '/'):
+      uri_strs = set()
+      prefixes = set()
+      for blr in self._test_wildcard_iterator(
+          self.test_bucket0_uri.clone_replace_name('nested1/*%s' % final_char)):
+        if blr.HasPrefix():
+          prefixes.add(blr.GetPrefix().name)
+        else:
+          uri_strs.add(blr.GetUri().uri)
+      self.assertEqual(1, len(uri_strs))
+      self.assertEqual(1, len(prefixes))
+      self.assertTrue('nested1/nested2/' in prefixes)
+
+  def testWildcardPlusSubdirMatch(self):
+    """Tests gs://bucket/*/subdir matching"""
+    actual_uri_strs = set()
+    actual_prefixes = set()
+    for blr in self._test_wildcard_iterator(
+        self.test_bucket0_uri.clone_replace_name('*/nested1')):
+      if blr.HasPrefix():
+        actual_prefixes.add(blr.GetPrefix().name)
+      else:
+        actual_uri_strs.add(blr.GetUri().uri)
+    expected_uri_strs = set()
+    expected_prefixes = set(['nested1/'])
+    self.assertEqual(expected_prefixes, actual_prefixes)
+    self.assertEqual(expected_uri_strs, actual_uri_strs)
+
+  def testWildcardPlusSubdirSubdirMatch(self):
+    """Tests gs://bucket/*/subdir/* matching"""
+    actual_uri_strs = set()
+    actual_prefixes = set()
+    for blr in self._test_wildcard_iterator(
+        self.test_bucket0_uri.clone_replace_name('*/nested2/*')):
+      if blr.HasPrefix():
+        actual_prefixes.add(blr.GetPrefix().name)
+      else:
+        actual_uri_strs.add(blr.GetUri().uri)
+    expected_uri_strs = set([
+      self.test_bucket0_uri.clone_replace_name('nested1/nested2/xyz1').uri,
+      self.test_bucket0_uri.clone_replace_name('nested1/nested2/xyz2').uri])
+    expected_prefixes = set()
+    self.assertEqual(expected_prefixes, actual_prefixes)
+    self.assertEqual(expected_uri_strs, actual_uri_strs)
+
+  def testNoMatchingWildcardedObjectUri(self):
+    """Tests that get back an empty iterator for non-matching wildcarded URI"""
+    res = list(self._test_wildcard_iterator(
+        self.test_bucket0_uri.clone_replace_name('*x0')).IterUris())
+    self.assertEqual(0, len(res))
+
+  def testWildcardedInvalidObjectUri(self):
+    """Tests that we raise an exception for wildcarded invalid URI"""
+    try:
+      for unused_ in self._test_wildcard_iterator(
+          'badscheme://asdf').IterUris():
+        self.assertFalse('Expected InvalidUriError not raised.')
+    except InvalidUriError, e:
+      # Expected behavior.
+      self.assertTrue(e.message.find('Unrecognized scheme') != -1)
+
+  def testSingleMatchWildcardedBucketUri(self):
+    """Tests matching a single bucket based on a wildcarded bucket URI"""
+    exp_obj_uri_strs = set([
+        suri(self.test_bucket1_uri) + self.test_bucket1_uri.delim])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            '%s*1' % self.base_uri_str).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testMultiMatchWildcardedBucketUri(self):
+    """Tests matching a multiple buckets based on a wildcarded bucket URI"""
+    exp_obj_uri_strs = set([
+        suri(self.test_bucket0_uri) + self.test_bucket0_uri.delim,
+        suri(self.test_bucket1_uri) + self.test_bucket1_uri.delim])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            '%s*' % self.base_uri_str).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testWildcardBucketAndObjectUri(self):
+    """Tests matching with both bucket and object wildcards"""
+    exp_obj_uri_strs = set([str(self.test_bucket0_uri.clone_replace_name(
+        'abcd'))])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            '%s0*/abc*' % self.base_uri_str).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testWildcardUpToFinalCharSubdirPlusObjectName(self):
+    """Tests wildcard subd*r/obj name"""
+    exp_obj_uri_strs = set([str(self.test_bucket0_uri.clone_replace_name(
+        'nested1/nested2/xyz1'))])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            '%snested1/nest*2/xyz1' % self.test_bucket0_uri.uri).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testPostRecursiveWildcard(self):
+    """Tests that wildcard containing ** followed by an additional wildcard works"""
+    exp_obj_uri_strs = set([str(self.test_bucket0_uri.clone_replace_name(
+        'nested1/nested2/xyz2'))])
+    actual_obj_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(
+            '%s**/*y*2' % self.test_bucket0_uri.uri).IterUris())
+    self.assertEqual(exp_obj_uri_strs, actual_obj_uri_strs)
+
+  def testCallingGetKeyOnProviderOnlyWildcardIteration(self):
+    """Tests that attempting iterating provider-only wildcard raises"""
+    try:
+      from gslib.bucket_listing_ref import BucketListingRefException
+      for iter_result in wildcard_iterator.wildcard_iterator(
+          'gs://', ProjectIdHandler(),
+          bucket_storage_uri_class=self.mock_bucket_storage_uri):
+        iter_result.GetKey()
+        self.fail('Expected BucketListingRefException not raised.')
+    except BucketListingRefException, e:
+      self.assertTrue(str(e).find(
+          'Attempt to call GetKey() on Key-less BucketListingRef') != -1)
+
+
+class FileIteratorTests(testcase.GsUtilUnitTestCase):
+  """FileWildcardIterator test suite"""
+
+  def setUp(self):
+    """
+    Creates a test dir containing 3 files and one nested subdirectory + file.
+    """
+    super(FileIteratorTests, self).setUp()
+
+    self.test_dir = self.CreateTempDir(test_files=[
+        'abcd', 'abdd', 'ade$', ('dir1', 'dir2', 'zzz')])
+
+    self.root_files_uri_strs = set([
+        suri(self.test_dir, 'abcd'),
+        suri(self.test_dir, 'abdd'),
+        suri(self.test_dir, 'ade$')])
+
+    self.subdirs_uri_strs = set([suri(self.test_dir, 'dir1')])
+
+    self.nested_files_uri_strs = set([
+        suri(self.test_dir, 'dir1', 'dir2', 'zzz')])
+
+    self.immed_child_uri_strs = self.root_files_uri_strs | self.subdirs_uri_strs
+    self.all_file_uri_strs = (
+        self.root_files_uri_strs | self.nested_files_uri_strs)
+
+  def testContainsWildcard(self):
+    """Tests ContainsWildcard call"""
+    self.assertTrue(ContainsWildcard('a*.txt'))
+    self.assertTrue(ContainsWildcard('a[0-9].txt'))
+    self.assertFalse(ContainsWildcard('0-9.txt'))
+    self.assertTrue(ContainsWildcard('?.txt'))
+
+  def testNoOpDirectoryIterator(self):
+    """Tests that directory-only URI iterates just that one URI"""
+    results = list(
+        self._test_wildcard_iterator(suri(tempfile.tempdir)).IterUris())
+    self.assertEqual(1, len(results))
+    self.assertEqual(suri(tempfile.tempdir), str(results[0]))
+
+  def testMatchingAllFiles(self):
+    """Tests matching all files, based on wildcard"""
+    uri = self._test_storage_uri(suri(self.test_dir, '*'))
+    actual_uri_strs = set(str(u) for u in
+                          self._test_wildcard_iterator(uri).IterUris()
+                         )
+    self.assertEqual(self.immed_child_uri_strs, actual_uri_strs)
+
+  def testMatchingFileSubset(self):
+    """Tests matching a subset of files, based on wildcard"""
+    exp_uri_strs = set(
+        [suri(self.test_dir, 'abcd'), suri(self.test_dir, 'abdd')])
+    uri = self._test_storage_uri(suri(self.test_dir, 'ab??'))
+    actual_uri_strs = set(str(u) for u in
+                          self._test_wildcard_iterator(uri).IterUris()
+                         )
+    self.assertEqual(exp_uri_strs, actual_uri_strs)
+
+  def testMatchingNonWildcardedUri(self):
+    """Tests matching a single named file"""
+    exp_uri_strs = set([suri(self.test_dir, 'abcd')])
+    uri = self._test_storage_uri(suri(self.test_dir, 'abcd'))
+    actual_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(uri).IterUris())
+    self.assertEqual(exp_uri_strs, actual_uri_strs)
+
+  def testMatchingFilesIgnoringOtherRegexChars(self):
+    """Tests ignoring non-wildcard regex chars (e.g., ^ and $)"""
+
+    exp_uri_strs = set([suri(self.test_dir, 'ade$')])
+    uri = self._test_storage_uri(suri(self.test_dir, 'ad*$'))
+    actual_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(uri).IterUris())
+    self.assertEqual(exp_uri_strs, actual_uri_strs)
+
+  def testRecursiveDirectoryOnlyWildcarding(self):
+    """Tests recursive expansion of directory-only '**' wildcard"""
+    uri = self._test_storage_uri(suri(self.test_dir, '**'))
+    actual_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(uri).IterUris())
+    self.assertEqual(self.all_file_uri_strs, actual_uri_strs)
+
+  def testRecursiveDirectoryPlusFileWildcarding(self):
+    """Tests recursive expansion of '**' directory plus '*' wildcard"""
+    uri = self._test_storage_uri(suri(self.test_dir, '**', '*'))
+    actual_uri_strs = set(
+        str(u) for u in self._test_wildcard_iterator(uri).IterUris())
+    self.assertEqual(self.all_file_uri_strs, actual_uri_strs)
+
+  def testInvalidRecursiveDirectoryWildcard(self):
+    """Tests that wildcard containing '***' raises exception"""
+    try:
+      uri = self._test_storage_uri(suri(self.test_dir, '***', 'abcd'))
+      for unused_ in self._test_wildcard_iterator(uri).IterUris():
+        self.fail('Expected WildcardException not raised.')
+    except wildcard_iterator.WildcardException, e:
+      # Expected behavior.
+      self.assertTrue(str(e).find('more than 2 consecutive') != -1)
+
+  def testMissingDir(self):
+    """Tests that wildcard gets empty iterator when directory doesn't exist"""
+    res = list(
+        self._test_wildcard_iterator(suri('no_such_dir', '*')).IterUris())
+    self.assertEqual(0, len(res))
+
+  def testExistingDirNoFileMatch(self):
+    """Tests that wildcard returns empty iterator when there's no match"""
+    uri = self._test_storage_uri(
+        suri(self.test_dir, 'non_existent*'))
+    res = list(self._test_wildcard_iterator(uri).IterUris())
+    self.assertEqual(0, len(res))