[autotest] Update control.bvt to use reimage_and_run()
Use the new, stable dynamic_suite API.
BUG=chromium-os:27345
TEST=./server/autoserv test_suites/dev_harness
STATUS=Fixed
Change-Id: Ic9c618ccca1924bfbb0e667466d20e52d57615fc
Reviewed-on: https://gerrit.chromium.org/gerrit/17368
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Masone <cmasone@chromium.org>
diff --git a/test_suites/control.bvt b/test_suites/control.bvt
index 0c511df..0a8ad19 100755
--- a/test_suites/control.bvt
+++ b/test_suites/control.bvt
@@ -28,11 +28,6 @@
import common
from autotest_lib.server.cros import dynamic_suite
-suite_tag = 'bvt'
-reimager = dynamic_suite.Reimager(job.autodir, pool=pool)
-
-if (dynamic_suite.skip_reimage(globals()) or
- reimager.attempt(build, board, job.record)):
- bvt = dynamic_suite.Suite.create_from_name(suite_tag, build, pool=pool,
- results_dir=job.resultdir)
- bvt.run_and_wait(job.record, add_experimental=True)
+dynamic_suite.reimage_and_run(
+ build=build, board=board, name='bvt', job=job, pool=pool,
+ add_experimental=True, skip_reimage=dynamic_suite.skip_reimage(globals()))