commit c65330c6ace7d5acd4f72dbc9dd5668320de657e
author Gilad Arnold <garnold@chromium.org> Thu Sep 20 15:17:48 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon Sep 24 23:44:47 2012 -0700
tree cac784a16fb50b6cd4bbe325a1a9d20264ddb596
parent 23988aec0f07d6a901159cf2a9e6e2285073b353

devserver: general cleanup

* Unified logging API via module/class-local _Log() calls.

* Renamed modules: devserver_util --> common_util (this is the common
  util module, and it saves a lot of characters in many places);
  downloadable_artifact --> build_artifact (we don't have any
  non-downloadable artifacts); buildutil.py --> build_util.py (for
  uniformity)

* Reorganized Artifact (now BuildArtifact) class hierarchy to properly
  reflect the inheritance chains.

BUG=None
TEST=Unit tests run successfully

Change-Id: I91f3bd7afe78cc1e2be10b64640515402fb6184b
Reviewed-on: https://gerrit.chromium.org/gerrit/33755
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>

downloader_unittest.py

diff --git a/downloader_unittest.py b/downloader_unittest.py
index 3c9e34b..0d3af77 100755
--- a/downloader_unittest.py
+++ b/downloader_unittest.py
@@ -4,7 +4,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Unit tests for devserver_util module."""
+"""Unit tests for downloader module."""
 
 import mox
 import os
@@ -12,9 +12,9 @@
 import tempfile
 import unittest
 
-import downloadable_artifact
+import build_artifact
+import common_util
 import devserver
-import devserver_util
 import downloader
 
 
@@ -41,26 +41,24 @@
   def _CommonDownloaderSetup(self, ignore_background=False):
     """Common code to downloader tests.
 
-    Mocks out key devserver_util module methods, creates mock artifacts
-    and sets appropriate expectations.
+    Mocks out key util module methods, creates mock artifacts and sets
+    appropriate expectations.
 
     @ignore_background Indicate that background artifacts should be ignored.
 
     @return iterable of artifact objects with appropriate expectations.
     """
     board = 'x86-mario-release'
-    self.mox.StubOutWithMock(devserver_util, 'AcquireLock')
-    self.mox.StubOutWithMock(devserver_util, 'GatherArtifactDownloads')
-    self.mox.StubOutWithMock(devserver_util, 'ReleaseLock')
+    self.mox.StubOutWithMock(common_util, 'AcquireLock')
+    self.mox.StubOutWithMock(common_util, 'GatherArtifactDownloads')
+    self.mox.StubOutWithMock(common_util, 'ReleaseLock')
     self.mox.StubOutWithMock(tempfile, 'mkdtemp')
 
     lock_tag = self._ClassUnderTest().GenerateLockTag(board, self.build)
-    devserver_util.AcquireLock(
+    common_util.AcquireLock(
         static_dir=self._work_dir,
         tag=lock_tag).AndReturn(self._work_dir)
-    devserver_util.ReleaseLock(
-        static_dir=self._work_dir,
-        tag=lock_tag)
+    common_util.ReleaseLock(static_dir=self._work_dir, tag=lock_tag)
 
     tempfile.mkdtemp(suffix=mox.IgnoreArg()).AndReturn(self._work_dir)
     return self._GenerateArtifacts(ignore_background)
@@ -69,9 +67,9 @@
     """Create and return a Downloader of the appropriate type.
 
     The returned downloader will expect to download and stage the
-    DownloadableArtifacts listed in [artifacts].
+    Artifacts listed in [artifacts].
 
-    @param artifacts: iterable of DownloadableArtifacts.
+    @param artifacts: iterable of Artifacts.
     @return instance of downloader.Downloader or subclass.
     """
     raise NotImplementedError()
@@ -123,7 +121,7 @@
     """
     artifacts = []
     for index in range(5):
-      artifact = self.mox.CreateMock(downloadable_artifact.DownloadableArtifact)
+      artifact = self.mox.CreateMock(build_artifact.BuildArtifact)
       # Make every other artifact synchronous.
       if index % 2 == 0:
         artifact.Synchronous = lambda: True
@@ -167,7 +165,7 @@
   def testInteractionWithDevserver(self):
     """Tests interaction between the downloader and devserver methods."""
     artifacts = self._CommonDownloaderSetup(ignore_background=True)
-    devserver_util.GatherArtifactDownloads(
+    common_util.GatherArtifactDownloads(
         self._work_dir, self.archive_url_prefix, self._work_dir,
         self.build).AndReturn(artifacts)
 
@@ -234,12 +232,12 @@
   def _GenerateArtifacts(self, unused_ignore_background):
     """Instantiate artifact mocks and set expectations on them.
 
-    Sets up a DebugTarball and sets up expectation that it will be
+    Sets up a DebugTarballBuildArtifact and sets up expectation that it will be
     downloaded and staged.
 
     @return iterable of one artifact object with appropriate expectations.
     """
-    artifact = self.mox.CreateMock(downloadable_artifact.DownloadableArtifact)
+    artifact = self.mox.CreateMock(build_artifact.BuildArtifact)
     artifact.Synchronous = lambda: True
     artifact.Download()
     artifact.Stage()