Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/test/gcs_helpers_test.py b/framework/test/gcs_helpers_test.py
index a7c01d0..5eab073 100644
--- a/framework/test/gcs_helpers_test.py
+++ b/framework/test/gcs_helpers_test.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Unit tests for the framework_helpers module."""
from __future__ import print_function
@@ -27,8 +26,7 @@
self.testbed.init_memcache_stub()
self.testbed.init_app_identity_stub()
- self.test_storage_client = mock.create_autospec(
- storage.Client, instance=True)
+ self.test_storage_client = mock.MagicMock()
mock.patch.object(
storage, 'Client', return_value=self.test_storage_client).start()