Move bvt suite into test harness.
Change-Id: I816fb4825814048aeb911e206067b9e1f6b8cfe4
BUG=chromium-os:12950
TEST=Ran it with buildbot change.
Review URL: http://codereview.chromium.org/6852004
diff --git a/au_test_harness/au_test.py b/au_test_harness/au_test.py
index 8b1df08..03c0ea9 100644
--- a/au_test_harness/au_test.py
+++ b/au_test_harness/au_test.py
@@ -231,8 +231,8 @@
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.
@@ -242,6 +242,16 @@
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.
diff --git a/au_test_harness/vm_au_worker.py b/au_test_harness/vm_au_worker.py
index d3113f2..aa4e929 100644
--- a/au_test_harness/vm_au_worker.py
+++ b/au_test_harness/vm_au_worker.py
@@ -102,9 +102,9 @@
if self.graphics_flag: commandWithArgs.append(self.graphics_flag)
self.TestInfo('Running smoke suite to verify image.')
output = cros_lib.RunCommand(
- commandWithArgs, error_ok=True, enter_chroot=False,
- redirect_stdout=True, redirect_stderr=True, cwd=self.crosutilsbin,
- print_cmd=False, combine_stdout_stderr=True)
+ commandWithArgs, error_ok=(percent_required_to_pass != 100),
+ enter_chroot=False, redirect_stdout=True, redirect_stderr=True,
+ cwd=self.crosutilsbin, print_cmd=False, combine_stdout_stderr=True)
return self.AssertEnoughTestsPassed(unittest, output,
percent_required_to_pass)
