Fix bugs in gcloud storage e2e test

test/storage/e2e_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library gcloud.storage;
 
 import 'dart:async';
 
 import 'package:googleapis/storage/v1.dart' as storage_api;
 import 'package:gcloud/storage.dart';
@@ skipping 62 matching lines @@
       ], (f) => f().then(expectAsync((_) {})));
     });
 
     test('create-error', () {
       storage.createBucket('goog-reserved').catchError(expectAsync((e) {
         expect(e, isNotNull);
       }), test: testDetailedApiError);
     });
   });
 
-  // TODO: Remove solo_ here when the rate-limit issue have been resolved.
-  solo_group('object', () {
+  group('object', () {
     // Run all object tests in the same bucket to try to avoid the rate-limit
     // for creating and deleting buckets while testing.
     Future withTestBucket(function) {
       return function(testBucket).whenComplete(() {
         // TODO: Clean the bucket.
       });
     }
 
     test('create-read-delete', () {
       Future test(name, bytes) {
@@ skipping 69 matching lines @@
         Acl acl1 = new Acl(
             [new AclEntry(AclScope.allAuthenticated, AclPermission.WRITE)]);
         Acl acl2 = new Acl(
             [new AclEntry(AclScope.allUsers, AclPermission.WRITE),
              new AclEntry(new AccountScope('sgjesse@google.com'),
                           AclPermission.WRITE)]);
         Acl acl3 = new Acl(
             [new AclEntry(AclScope.allUsers, AclPermission.WRITE),
              new AclEntry(new AccountScope('sgjesse@google.com'),
                           AclPermission.WRITE),
-             new AclEntry(new AccountScope('misc@dartlang.org'),
+             new AclEntry(new GroupScope('misc@dartlang.org'),
                           AclPermission.READ)]);
         Acl acl4 = new Acl(
             [new AclEntry(AclScope.allUsers, AclPermission.WRITE),
              new AclEntry(new AccountScope('sgjesse@google.com'),
                           AclPermission.WRITE),
              new AclEntry(new GroupScope('misc@dartlang.org'),
                           AclPermission.READ),
              new AclEntry(new DomainScope('dartlang.org'),
                           AclPermission.FULL_CONTROL)]);
 
+        // The expected length of the returned ACL is one longer than the one
+        // use during creation as an additional 'used-ID' ACL entry is added
+        // by cloud storage during creation.
         return Future.forEach([
-            () => test('test-1', acl1, 1),
-            () => test('test-2', acl2, 2),
-            () => test('test-3', acl3, 3),
-            () => test('test-4', acl4, 4)
+            () => test('test-1', acl1, acl1.entries.length + 1),
+            () => test('test-2', acl2, acl2.entries.length + 1),
+            () => test('test-3', acl3, acl3.entries.length + 1),
+            () => test('test-4', acl4, acl4.entries.length + 1)
         ], (f) => f().then(expectAsync((_) {})));
       });
     });
 
     test('create-with-metadata-delete', () {
       return withTestBucket((Bucket bucket) {
         Future test(objectName, metadata, bytes) {
           return bucket.writeBytes(objectName, bytes, metadata: metadata)
               .then(expectAsync((result) {
                 expect(result, isNotNull);
@@ skipping 56 matching lines @@
       }).whenComplete(() {
         // Deleting a bucket relies on eventually consistent behaviour, hence
         // the delay in attempt to prevent test flakiness.
         return new Future.delayed(STORAGE_LIST_DELAY, () {
           return storage.deleteBucket(testBucket);
         });
       });
     });
   });
 }