devserver: DevServerUtil suffix renamed
To retain consistency with a recent cleanup CL, in which devserver_util
was renamed common_util, we change class names starting with
DevServerUtil into CommonUtil.
BUG=None
TEST=Unit tests; devserver starts and serves content
Change-Id: I7bbc1d88d2e11d5c0def970c2a4226b1efe1bb59
Reviewed-on: https://gerrit.chromium.org/gerrit/34427
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
diff --git a/common_util_unittest.py b/common_util_unittest.py
index fb0774d..8ba8fbd 100755
--- a/common_util_unittest.py
+++ b/common_util_unittest.py
@@ -27,7 +27,7 @@
}
-class DevServerUtilTest(mox.MoxTestBase):
+class CommonUtilTest(mox.MoxTestBase):
def setUp(self):
mox.MoxTestBase.setUp(self)
@@ -189,7 +189,7 @@
# Attempt to freshly create and lock an existing directory.
common_util.AcquireLock(self._static_dir, 'test-lock')
common_util.ReleaseLock(self._static_dir, 'test-lock')
- self.assertRaises(common_util.DevServerUtilError, common_util.AcquireLock,
+ self.assertRaises(common_util.CommonUtilError, common_util.AcquireLock,
self._static_dir, 'test-lock')
common_util.AcquireLock(self._static_dir, 'test-lock', create_once=False)
common_util.ReleaseLock(self._static_dir, 'test-lock', destroy=True)
@@ -202,7 +202,7 @@
# Attempt to lock an already locked directory.
common_util.AcquireLock(self._static_dir, 'test-lock')
- self.assertRaises(common_util.DevServerUtilError, common_util.AcquireLock,
+ self.assertRaises(common_util.CommonUtilError, common_util.AcquireLock,
self._static_dir, 'test-lock')
common_util.ReleaseLock(self._static_dir, 'test-lock', destroy=True)
@@ -242,14 +242,14 @@
'R17-1413.0.0-a1-b1346')
def testGetLatestBuildVersionLatest(self):
- """Test that we raise DevServerUtilError when a build dir is empty."""
- self.assertRaises(common_util.DevServerUtilError,
+ """Test that we raise CommonUtilError when a build dir is empty."""
+ self.assertRaises(common_util.CommonUtilError,
common_util.GetLatestBuildVersion,
self._static_dir, 'test-board-3')
def testGetLatestBuildVersionUnknownBuild(self):
- """Test that we raise DevServerUtilError when a build dir does not exist."""
- self.assertRaises(common_util.DevServerUtilError,
+ """Test that we raise CommonUtilError when a build dir does not exist."""
+ self.assertRaises(common_util.CommonUtilError,
common_util.GetLatestBuildVersion,
self._static_dir, 'bad-dir')
@@ -534,7 +534,7 @@
common_util.IsAvailable(mox.IgnoreArg(), mox.IgnoreArg()).AndReturn(False)
self.mox.ReplayAll()
- self.assertRaises(common_util.DevServerUtilError,
+ self.assertRaises(common_util.CommonUtilError,
common_util.WaitUntilAvailable,
to_wait_list,
archive_url,