commit fd97b4083b3b9c5c561284061e5b6659e8bb08fa
author Don Garrett <dgarrett@chromium.org> Thu Sep 03 00:59:21 2015 +0000
committer chrome-bot <chrome-bot@chromium.org> Wed Sep 02 22:08:00 2015 -0700
tree 542869450130d8721ab38d762b9bd17a7575e06e
parent 9567de2769c1c0806c362364b95cbe6eb1dcbec9

Revert "pushimage: add support for handling base image"

This reverts commit 01c965a7081505d8071c27b707c9b77776c78c1a.

BUG=chromium:527277
TEST=Unable to reproduce, so testing in production. (sigh)

Change-Id: If92f7d4821340d850e54b675a203e74bd13aece1
Reviewed-on: https://chromium-review.googlesource.com/296837
Commit-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Amey Deshpande <ameyd@google.com>

scripts/pushimage_unittest.py

diff --git a/scripts/pushimage_unittest.py b/scripts/pushimage_unittest.py
index 44caf6f..1dd7c4a 100644
--- a/scripts/pushimage_unittest.py
+++ b/scripts/pushimage_unittest.py
@@ -195,31 +195,12 @@
              'ChromeOS-recovery-R34-5126.0.0-test.board.instructions')],
     }
 
-    with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
-      urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
-                                 sign_types=['recovery'])
+    urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
+                               sign_types=['recovery'])
     self.assertEqual(self.gs_mock.call_count, 20)
     self.assertTrue(self.mark_mock.called)
     self.assertEqual(urls, EXPECTED)
 
-  def testSignTypesBase(self):
-    """Only sign the requested recovery type"""
-    EXPECTED = {
-        'canary': [
-            ('gs://chromeos-releases/canary-channel/test.board/5126.0.0/'
-             'ChromeOS-base-R34-5126.0.0-test.board.instructions')],
-        'dev': [
-            ('gs://chromeos-releases/dev-channel/test.board/5126.0.0/'
-             'ChromeOS-base-R34-5126.0.0-test.board.instructions')],
-    }
-
-    with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
-      urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
-                                 sign_types=['base'])
-    self.assertEqual(self.gs_mock.call_count, 22)
-    self.assertTrue(self.mark_mock.called)
-    self.assertEqual(urls, EXPECTED)
-
   def testSignTypesNone(self):
     """Verify nothing is signed when we request an unavailable type"""
     urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',