[autotest] fix 2 remaining unit tests that fail on builder
1) common_util_test has a test that assumes the USER environment
variable is set. However, this envvar is in fact NOT set in the builder
environment. The test has been modified to catch the resulting KeyError
and skip the test.
2) full_release_test fails on the builder due to an exception in
importing the dev_server module. For now I'm adding this test to the
SKIP_TEST list, and filing a bug to get that import logic sorted out.
BUG=chromium:221254
TEST=ran a tryjob, tests passed on builder.
Change-Id: Id0d3369e6529479235388e5dde8f78af9ea9d545
Reviewed-on: https://gerrit.chromium.org/gerrit/60163
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Alex Miller <milleral@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
diff --git a/site_utils/chromeos_test/common_util_test.py b/site_utils/chromeos_test/common_util_test.py
index 4b737e2..d643635 100755
--- a/site_utils/chromeos_test/common_util_test.py
+++ b/site_utils/chromeos_test/common_util_test.py
@@ -3,6 +3,7 @@
# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# pylint: disable-msg=C0111
"""Unit tests for common utility class."""
@@ -30,7 +31,11 @@
def testRunCommandEnvironment(self):
old_env = os.environ.copy()
# Ensure variables from local environment are present.
- user = os.environ['USER']
+ try:
+ user = os.environ['USER']
+ except KeyError:
+ raise unittest.SkipTest('USER environment variable is not set.')
+
self.assertEqual(
common_util.RunCommand(cmd='echo $test_var-$USER',
env={'test_var': 'Test'}, output=True),
diff --git a/utils/unittest_suite.py b/utils/unittest_suite.py
index a3ef751..63b0532 100755
--- a/utils/unittest_suite.py
+++ b/utils/unittest_suite.py
@@ -93,6 +93,7 @@
'reporting_unittest.py',
# crbug.com/251395
'dev_server_test.py',
+ 'full_release_test.py',
))
LONG_TESTS = (REQUIRES_MYSQLDB |