ctest: Deprecate more of unused flags, etc.
We do this so we can easier deprecate ctest and use cros_au_test_harness
instead and eventually move them to chromite.
BUG=chromium:872441
TEST=related unittests
TEST=CQ passes
TEST=betty-release-tryjob
Change-Id: If4cbc71a556e7279d4942f7dc1679f334b7217be
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crostestutils/+/1828292
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>
diff --git a/au_test_harness/au_worker.py b/au_test_harness/au_worker.py
index 9f304ea..063b83b 100644
--- a/au_test_harness/au_worker.py
+++ b/au_test_harness/au_worker.py
@@ -30,10 +30,7 @@
self.use_delta_updates = options.delta
self.verbose = options.verbose
self.vm_image_path = None
- if options.quick_test:
- self.verify_suite = 'build_RootFilesystemSize'
- else:
- self.verify_suite = 'suite:%s' % (options.verify_suite_name or 'smoke')
+ self.verify_suite = 'suite:%s' % (options.verify_suite_name or 'smoke')
self.ssh_private_key = options.ssh_private_key
# Attributes to be initialized in Initialize.
diff --git a/au_test_harness/cros_au_test_harness.py b/au_test_harness/cros_au_test_harness.py
index 54fb8fa..422bfc6 100755
--- a/au_test_harness/cros_au_test_harness.py
+++ b/au_test_harness/cros_au_test_harness.py
@@ -37,9 +37,6 @@
from crostestutils.lib import test_helper
-# File location for update cache in given folder.
-CACHE_FILE = 'update.cache'
-
class _LessBacktracingTestResult(unittest._TextTestResult):
"""TestResult class that suppresses stacks for AssertionError."""
@@ -152,23 +149,16 @@
def main():
test_helper.SetupCommonLoggingFormat()
parser = argparse.ArgumentParser()
- parser.add_argument('-b', '--base_image',
+ parser.add_argument('--base_image',
help='path to the base image.')
- parser.add_argument('-r', '--board',
+ parser.add_argument('--board',
help='board for the images.')
- parser.add_argument('--no_delta', action='store_false', default=True,
- dest='delta',
- help='Disable using delta updates.')
parser.add_argument('--no_graphics', action='store_true',
help='Disable graphics for the vm test.')
parser.add_argument('-j', '--jobs',
default=test_helper.CalculateDefaultJobs(), type=int,
help='Number of simultaneous jobs')
- parser.add_argument('-q', '--quick_test', default=False, action='store_true',
- help='Use a basic test to verify image.')
- parser.add_argument('-m', '--remote',
- help='Remote address for real test.')
- parser.add_argument('-t', '--target_image',
+ parser.add_argument('--target_image',
help='path to the target image.')
parser.add_argument('--test_results_root', default=None,
help='Root directory to store test results. Should '
@@ -176,7 +166,7 @@
parser.add_argument('--test_prefix', default='test',
help='Only runs tests with specific prefix i.e. '
'testFullUpdateWipeStateful.')
- parser.add_argument('-p', '--type', default='vm', choices=('vm', 'gce'),
+ parser.add_argument('--type', default='vm', choices=('vm', 'gce'),
help='type of test to run: [vm, gce]. Default: vm.')
parser.add_argument('--verbose', default=True, action='store_true',
help='Print out rather than capture output as much as '
diff --git a/au_test_harness/cros_au_test_harness_unittest.py b/au_test_harness/cros_au_test_harness_unittest.py
index 88ea5c2..b0ce25e 100755
--- a/au_test_harness/cros_au_test_harness_unittest.py
+++ b/au_test_harness/cros_au_test_harness_unittest.py
@@ -25,7 +25,7 @@
class CrosAuTestHarnessTest(unittest.TestCase):
"""Testing the GCE related funcionalities in cros_au_test_harness.py"""
- INVALID_TYPE_ERROR = 'error: argument -p/--type: invalid choice'
+ INVALID_TYPE_ERROR = 'error: argument --type: invalid choice'
INVALID_IMAGE_PATH = 'Testing requires a valid target image.'
def testCheckOptionsDisallowsUndefinedType(self):
diff --git a/au_test_harness/gce_au_worker_unittest.py b/au_test_harness/gce_au_worker_unittest.py
index 561dbc1..a840504 100755
--- a/au_test_harness/gce_au_worker_unittest.py
+++ b/au_test_harness/gce_au_worker_unittest.py
@@ -33,7 +33,6 @@
self.board = 'lakitu'
self.delta = False
self.verbose = False
- self.quick_test = False
self.verify_suite_name = 'gce-smoke'
diff --git a/ctest/ctest.py b/ctest/ctest.py
index 79e53e4..c8aee19 100755
--- a/ctest/ctest.py
+++ b/ctest/ctest.py
@@ -35,11 +35,8 @@
Variables:
base: Base image to test from.
board: the board for the latest image.
- archive_dir: Location where images for past versions are archived.
crosutils_root: Location of crosutils.
- jobs: Numbers of threads to run in parallel.
no_graphics: boolean: If True, disable graphics during vm test.
- remote: ip address for real test harness run.
target: Target image to test.
test_results_root: Root directory to store au_test_harness results.
type: which test harness to run. Possible values: real, vm, gce.
@@ -54,15 +51,12 @@
"""
self.base = None
self.board = opts.board
- self.archive_dir = opts.archive_dir
self.crosutils_root = os.path.join(constants.SOURCE_ROOT, 'src', 'scripts')
self.no_graphics = opts.no_graphics
- self.remote = opts.remote
self.target = opts.target_image
self.test_results_root = opts.test_results_root
self.type = opts.type
self.whitelist_chrome_crashes = opts.whitelist_chrome_crashes
- self.jobs = opts.jobs
# An optional ssh private key used for testing.
self.ssh_private_key = opts.ssh_private_key
@@ -81,14 +75,6 @@
self.target = os.path.join(
latest_image_dir, image_extractor.ImageExtractor.IMAGE_TO_EXTRACT)
- # Grab the latest official build for this board to use as the base image.
- if self.archive_dir:
- target_version = os.path.realpath(self.target).rsplit('/', 2)[-2]
- extractor = image_extractor.ImageExtractor(self.archive_dir)
- latest_image_dir = extractor.GetLatestImage(target_version)
- if latest_image_dir:
- self.base = extractor.UnzipImage(latest_image_dir)
-
if not self.base:
logging.info('Could not find a latest image to use. '
'Using target instead.')
@@ -113,9 +99,7 @@
'--target_image=%s' % self.target,
'--board=%s' % self.board,
'--type=%s' % self.type,
- '--remote=%s' % self.remote,
'--verbose',
- '--jobs=%d' % self.jobs,
]
if self.ssh_private_key is not None:
@@ -150,19 +134,10 @@
parser = argparse.ArgumentParser()
parser.add_argument('-b', '--board',
help='board for the image to compare against.')
- parser.add_argument('--archive_dir',
- help='Directory containing previously archived images.')
- parser.add_argument('--cache', default=False, action='store_true',
- help='Cache payloads')
- parser.add_argument('--jobs', default=test_helper.CalculateDefaultJobs(),
- type=int,
- help='Number of threads to run in parallel.')
parser.add_argument('--no_graphics', action='store_true', default=False,
help='Disable graphics for the vm test.')
parser.add_argument('--only_verify', action='store_true', default=False,
help='Only run basic verification suite.')
- parser.add_argument('--remote', default='0.0.0.0',
- help='For real tests, ip address of the target machine.')
parser.add_argument('--target_image', default=None,
help='Target image to test.')
parser.add_argument('--suite', default=None, help='Test suite to run.')
diff --git a/ctest/ctest_unittest.py b/ctest/ctest_unittest.py
index 9fb6344..e460bed 100755
--- a/ctest/ctest_unittest.py
+++ b/ctest/ctest_unittest.py
@@ -51,7 +51,6 @@
ctester = ctest.CTest(None) # Calls mocked out __init__.
ctester.target = 'some_image/target_version/file.bin'
ctester.base = None
- ctester.archive_dir = self.ARCHIVE_DIR
ctester.FindTargetAndBaseImages()
self.mox.VerifyAll()
self.assertEqual(ctester.base, ctester.target)
@@ -82,7 +81,6 @@
ctester = ctest.CTest(None) # Calls mocked out __init__.
ctester.target = 'some_image/target_version/file.bin'
ctester.base = None
- ctester.archive_dir = self.ARCHIVE_DIR
ctester.FindTargetAndBaseImages()
self.mox.VerifyAll()
self.assertEqual(ctester.base, latest_base_path)
@@ -115,7 +113,6 @@
ctester = ctest.CTest(None) # Calls mocked out __init__.
ctester.target = None
ctester.base = None
- ctester.archive_dir = self.ARCHIVE_DIR
ctester.board = 'board'
ctester.crosutils_root = fake_crosutils
ctester.FindTargetAndBaseImages()
