commit 9fd20a8c1d286f7299c23adfb2095689e1e24196
author Don Garrett <dgarrett@google.com> Thu Sep 04 11:37:22 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 03 09:09:13 2014 +0000
tree 737cc91a0e3ce339f430f89d0861e6638626ebd6
parent 5456858c3e51154359706586c4d79dfa8763323b

gs: Stat: add helper to return structured results

This is needed by paygen and the signer, and let's us clean up existing
gs logic by using this new helper.

BUG=chromium:322740
BUG=chromium:417035
TEST=Unittests (using --network)

Change-Id: I4243500ff3333834d3c27100ed52f3df35793c39
Reviewed-on: https://chromium-review.googlesource.com/220014
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

scripts/pushimage_unittest.py

diff --git a/scripts/pushimage_unittest.py b/scripts/pushimage_unittest.py
index 123560d..8a8cfe7 100755
--- a/scripts/pushimage_unittest.py
+++ b/scripts/pushimage_unittest.py
@@ -8,6 +8,7 @@
 from __future__ import print_function
 
 import logging
+import mock
 import os
 import sys
 
@@ -16,6 +17,7 @@
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
 from chromite.lib import git
+from chromite.lib import gs
 from chromite.lib import gs_unittest
 from chromite.lib import osutils
 from chromite.lib import partial_mock
@@ -28,10 +30,11 @@
 
   def testBasic(self):
     """Simple smoke test"""
-    insns = pushimage.InputInsns('test.board')
-    insns.GetInsnFile('recovery')
-    self.assertEqual(insns.GetChannels(), ['dev', 'canary'])
-    self.assertEqual(insns.GetKeysets(), ['stumpy-mp-v3'])
+    with mock.patch.object(gs.GSContext, 'Exists', return_value=False):
+      insns = pushimage.InputInsns('test.board')
+      insns.GetInsnFile('recovery')
+      self.assertEqual(insns.GetChannels(), ['dev', 'canary'])
+      self.assertEqual(insns.GetKeysets(), ['stumpy-mp-v3'])
 
   def testGetInsnFile(self):
     """Verify various inputs result in right insns path"""
@@ -182,15 +185,17 @@
             'gs://chromeos-releases/dev-channel/test.board-hi/5126.0.0/'
               'ChromeOS-recovery-R34-5126.0.0-test.board-hi.instructions'],
     }
-    urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
-                               profile='hi')
+    with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
+      urls = pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
+                                 profile='hi')
 
     self.assertEqual(urls, EXPECTED)
 
   def testBasicMock(self):
     """Simple smoke test in mock mode"""
-    pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
-                        dry_run=True, mock=True)
+    with mock.patch.object(gs.GSContext, 'Exists', return_value=True):
+      pushimage.PushImage('/src', 'test.board', 'R34-5126.0.0',
+                          dry_run=True, mock=True)
 
   def testBadVersion(self):
     """Make sure we barf on bad version strings"""