Move bvt suite into test harness.

au_test_harness/au_test.py

 # Copyright (c) 2011 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.
 
 """Module containing a test suite that is run to test auto updates."""
 
 import os
 import tempfile
 import time
 import unittest
@@ skipping 213 matching lines @@
           if self.data_size > (2 * 1024 * 1024):
             self.delay_count += 1
             time.sleep(20)
 
         self.data_size += len(data)
         return data
 
     self.worker.Initialize(9225)
     self.AttemptUpdateWithFilter(DelayedFilter(), proxy_port=8083)
 
-  def SimpleTest(self):
-    """A simple update that updates once from a base image to a target.
+  def SimpleTestUpdateAndVerify(self):
+    """Test that updates once from a base image to a target.
 
     We explicitly don't use test prefix so that isn't run by default.  Can be
     run using test_prefix option.
     """
     self.worker.Initialize(9226)
     self.worker.PrepareBase(self.base_image_path)
     self.worker.PerformUpdate(self.target_image_path, self.base_image_path)
     self.worker.VerifyImage(self)
 
+  def SimpleTestVerify(self):
+    """Test that only verifies the target image.
+
+    We explicitly don't use test prefix so that isn't run by default.  Can be
+    run using test_prefix option.
+    """
+    self.worker.Initialize(9227)
+    self.worker.PrepareBase(self.target_image_path)
+    self.worker.VerifyImage(self)
+
   # --- DISABLED TESTS ---
 
   # TODO(sosa): Get test to work with verbose.
   def NotestPartialUpdate(self):
     """Tests what happens if we attempt to update with a truncated payload."""
     self.worker.Initialize(9227)
     # Preload with the version we are trying to test.
     self.worker.PrepareBase(self.target_image_path)
 
     # Image can be updated at:
@@ skipping 20 matching lines @@
     url = 'http://gsdview.appspot.com/chromeos-localmirror/' \
           'autest-images/corrupted_image.gz'
     payload = os.path.join(self.download_folder, 'corrupted.gz')
 
     # Read from the URL and write to the local file
     urllib.urlretrieve(url, payload)
 
     # This update is expected to fail...
     expected_msg = 'zlib inflate() error:-3'
     self.AttemptUpdateWithPayloadExpectedFailure(payload, expected_msg)