Stop staging artifacts.
Cut the stage step when devserver downloads artifacts. Post-download
activity (extracting tarballs, etc) renamed to setup.
BUG=chromium:214454
TEST=Unittests & cbuildbot --remote on mario-paladin and lumpy-release
Change-Id: I851f3a44e80aa344312ef5f7e92b780d177b69d8
Reviewed-on: https://gerrit.chromium.org/gerrit/60124
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Joy Chen <joychen@chromium.org>
Reviewed-by: Joy Chen <joychen@chromium.org>
Tested-by: Joy Chen <joychen@chromium.org>
diff --git a/build_artifact_unittest.py b/build_artifact_unittest.py
index 7e0ee89..9173513 100755
--- a/build_artifact_unittest.py
+++ b/build_artifact_unittest.py
@@ -69,7 +69,7 @@
self.assertTrue(os.path.exists(os.path.join(
self.work_dir, file_to_download)))
- def testDownloadAndStageAutotest(self):
+ def testDownloadAutotest(self):
"""Downloads a real autotest tarball for test."""
self.mox.StubOutWithMock(build_artifact.AutotestTarballBuildArtifact,
'_Extract')
@@ -77,15 +77,14 @@
self.work_dir, _TEST_GOLO_ARCHIVE, build_artifact.AUTOTEST_FILE,
_VERSION, None, ['autotest/test_suites'])
- stage_dir = os.path.join(self.work_dir, 'stage')
- os.makedirs(stage_dir)
- artifact.staging_dir = stage_dir
+ install_dir = self.work_dir
+ artifact.staging_dir = install_dir
artifact._Download()
self.mox.StubOutWithMock(subprocess, 'check_call')
artifact._Extract()
- subprocess.check_call(mox.In('autotest/utils/packager.py'), cwd=stage_dir)
+ subprocess.check_call(mox.In('autotest/utils/packager.py'), cwd=install_dir)
self.mox.ReplayAll()
- artifact._Stage()
+ artifact._Setup()
self.mox.VerifyAll()
self.assertTrue(os.path.isdir(
os.path.join(self.work_dir, 'autotest', 'packages')))