Update test harness to take in optional public and private keys to sign payloads.

bin/ctest.py

 #!/usr/bin/python
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Wrapper for tests that are run on builders."""
 
 import fileinput
 import optparse
@@ skipping 207 matching lines @@
     fh.close()
 
   version = zip_url.split('/')[-2]
   if not _GreaterVersion(version, _NEW_STYLE_VERSION) == version:
     # If the version isn't ready for new style, touch file to use old style.
     old_style_touch_path = os.path.join(download_folder, '.use_e1000')
     fh = open(old_style_touch_path, 'w+')
     fh.close()
 
 
-def WipeDevServerCache():
-  """Wipes the cache of the dev server."""
-  RunCommand(['sudo',
-              './start_devserver',
-              '--clear_cache',
-              '--exit',
-             ], enter_chroot=True)
-
-
 def RunAUTestHarness(board, channel, latest_url_base, zip_server_base,
-                     no_graphics, type, remote):
+                     no_graphics, type, remote, clean):
   """Runs the auto update test harness.
 
   The auto update test harness encapsulates testing the auto-update mechanism
   for the latest image against the latest official image from the channel.  This
   also tests images with suite_Smoke (built-in as part of its verification
   process).
 
   Args:
     board: the board for the latest image.
     channel: the channel to run the au test harness against.
     latest_url_base: base url for getting latest links.
     zip_server_base:  base url for zipped images.
     no_graphics: boolean - If True, disable graphics during vm test.
     type: which test harness to run.  Possible values: real, vm.
     remote: ip address for real test harness run.
+    clean: Clean the state of test harness before running.
   """
   crosutils_root = os.path.join(os.path.dirname(__file__), '..')
   download_folder = os.path.abspath('latest_download')
   zip_url = GetLatestZipUrl(board, channel, latest_url_base, zip_server_base)
   GrabZipAndExtractImage(zip_url, download_folder, _IMAGE_TO_EXTRACT)
 
   # Tests go here.
   latest_image = RunCommand(['./get_latest_image.sh', '--board=%s' % board],
                             cwd=crosutils_root, redirect_stdout=True,
                             print_cmd=True).strip()
 
   cmd = ['bin/cros_au_test_harness',
          '--base_image=%s' % os.path.join(download_folder,
                                           _IMAGE_TO_EXTRACT),
          '--target_image=%s' % os.path.join(latest_image,
                                             _IMAGE_TO_EXTRACT),
          '--board=%s' % board,
          '--type=%s' % type,
          '--remote=%s' % remote,
          ]
   if no_graphics: cmd.append('--no_graphics')
+  if clean: cmd.append('--clean')
 
   RunCommand(cmd, cwd=crosutils_root)
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('-b', '--board',
                     help='board for the image to compare against.')
   parser.add_option('-c', '--channel',
                     help='channel for the image to compare against.')
   parser.add_option('--cache', default=False, action='store_true',
                     help='Cache payloads')
   parser.add_option('-l', '--latestbase',
                     help='Base url for latest links.')
   parser.add_option('-z', '--zipbase',
                     help='Base url for hosted images.')
   parser.add_option('--no_graphics', action='store_true', default=False,
                     help='Disable graphics for the vm test.')
   parser.add_option('--type', default='vm',
                     help='type of test to run: [vm, real]. Default: vm.')
   parser.add_option('--remote', default='0.0.0.0',
                     help='For real tests, ip address of the target machine.')
 
   # Set the usage to include flags.
   parser.set_usage(parser.format_help())
   (options, args) = parser.parse_args()
 
-  if args:
-    parser.error('Extra args found %s.' % args)
-
-  if not options.board:
-    parser.error('Need board for image to compare against.')
-
-  if not options.channel:
-    parser.error('Need channel for image to compare against.')
-
-  if not options.zipbase:
-    parser.error('Need zip url base to get images.')
-
-  if not options.cache:
-    Info('Wiping dev server cache.')
-    WipeDevServerCache()
+  if args: parser.error('Extra args found %s.' % args)
+  if not options.board: parser.error('Need board for image to compare against.')
+  if not options.channel: parser.error('Need channel e.g. dev-channel.')
+  if not options.zipbase: parser.error('Need zip url base to get images.')
 
   RunAUTestHarness(options.board, options.channel, options.latestbase,
                    options.zipbase, options.no_graphics, options.type,
-                   options.remote)
+                   options.remote, not options.cache)
 
 
 if __name__ == '__main__':
   main()