commit 4b09efad0252be33a14d51cab933c7139c1f805c
author Scott Zawalski <scottz@chromium.org> Mon Jul 09 22:53:19 2012 -0700
committer Scott Zawalski <scottz@chromium.org> Mon Jul 09 22:54:34 2012 -0700
tree 4a51d3bfdd14009f4be9415f305ff61fa9d774c2
parent 5745152ef56cb61afed063bfcf924b59c0e76545

Revert "Replace autotest.tar.bz2 with autotest.tar at Dev server"

No control files are found in the autotest.tar. Reverting for now. 

This reverts commit d4d426532ea2286ef53dc2550200d53b93fc621c

Change-Id: Ic2cbe8c64a4b444e8c4ca669056ca43ac5abf461
Reviewed-on: https://gerrit.chromium.org/gerrit/27015
Commit-Ready: Scott Zawalski <scottz@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Tested-by: Scott Zawalski <scottz@chromium.org>

downloadable_artifact_unittest.py

diff --git a/downloadable_artifact_unittest.py b/downloadable_artifact_unittest.py
index 6964b72..b6ef089 100755
--- a/downloadable_artifact_unittest.py
+++ b/downloadable_artifact_unittest.py
@@ -24,11 +24,6 @@
     'gs://chromeos-image-archive/x86-alex-release/R19-2003.0.0-a1-b1819')
 _TEST_SUITES_TAR = '/'.join([_TEST_GOLO_ARCHIVE,
                              downloadable_artifact.TEST_SUITES_PACKAGE])
-_TEST_TEMP_ARCHIVE = (
-    'gs://chromeos-image-archive/trybot-lumpy-paladin/R22-2531.0.0-a1-b145')
-_AUTOTEST_TAR = '/'.join([_TEST_TEMP_ARCHIVE,
-                          downloadable_artifact.AUTOTEST_PACKAGE])
-
 
 class DownloadableArtifactTest(mox.MoxTestBase):
 
@@ -61,15 +56,14 @@
 
 
   def testDownloadAndStageAutotest(self):
-    """Downloads a real autotest tarball for test."""
+    """Downloads a real tarball, untars it, and treats it like Autotest."""
     artifact = downloadable_artifact.AutotestTarball(
-        _AUTOTEST_TAR, os.path.join(self.work_dir, 'stage'),
+        _TEST_SUITES_TAR, os.path.join(self.work_dir, 'stage'),
         os.path.join(self.work_dir, 'install'), True)
     artifact.Download()
-    self.mox.StubOutWithMock(downloadable_artifact.AutotestTarball,
-                             '_ExtractTarball')
+    self.mox.StubOutWithMock(downloadable_artifact.Tarball, '_ExtractTarball')
     self.mox.StubOutWithMock(subprocess, 'check_call')
-    downloadable_artifact.AutotestTarball._ExtractTarball(
+    downloadable_artifact.Tarball._ExtractTarball(
         exclude='autotest/test_suites')
     subprocess.check_call(mox.StrContains('autotest/utils/packager.py'),
                           cwd=os.path.join(self.work_dir, 'stage'), shell=True)