diff options
| author | Mike Frysinger <vapier@chromium.org> | 2014-12-08 11:55:32 -0500 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-21 11:49:26 +0000 |
| commit | ea838d15da20e8e5cf9f78b1bd06728c1607f575 (patch) | |
| tree | 04489251c775a91ef1923a4a5488a6cc41c7235a /cbuildbot/prebuilts_unittest.py | |
| parent | 27f1347d05b31d7b61462c3c469eea0ec5f7a386 (diff) | |
| download | chromite-ea838d15da20e8e5cf9f78b1bd06728c1607f575.tar.gz | |
unittests: cut over to the new wrapper
Now that we have a wrapper to deal with the namespace munging, we can
clean up all our unittests. This means:
- add a wrapper symlink for all the unittests
- drop the +x bits on the direct .py file
- drop the shebang on the direct .py file
- delete the manual sys.path munging
- move the mock import to the common system import path
- delete unused os/sys imports
- delete most manual calls to cros_test_lib.main
- add a main() for the few complicated cros_test_lib.main calls
BUG=chromium:219660
TEST=ran all the unittests
Change-Id: I85614c301e48c86a0ca4201c2b60349d2d488e52
Reviewed-on: https://chromium-review.googlesource.com/233832
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'cbuildbot/prebuilts_unittest.py')
| -rw-r--r--[-rwxr-xr-x] | cbuildbot/prebuilts_unittest.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/cbuildbot/prebuilts_unittest.py b/cbuildbot/prebuilts_unittest.py index b0fc8da93..79ba45e7b 100755..100644 --- a/cbuildbot/prebuilts_unittest.py +++ b/cbuildbot/prebuilts_unittest.py @@ -1,4 +1,3 @@ -#!/usr/bin/python # Copyright (c) 2014 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. @@ -7,20 +6,14 @@ from __future__ import print_function +import mock import os -import sys -import constants -sys.path.insert(0, constants.SOURCE_ROOT) +from chromite.cbuildbot import constants from chromite.cbuildbot import prebuilts from chromite.lib import cros_build_lib_unittest -from chromite.lib import cros_test_lib from chromite.lib import osutils -# TODO(build): Finish test wrapper (http://crosbug.com/37517). -# Until then, this has to be after the chromite imports. -import mock - # pylint: disable=W0212 class PrebuiltTest(cros_build_lib_unittest.RunCommandTempDirTestCase): @@ -111,7 +104,3 @@ ca-t3/pk-g4-4.0.1-r333 """Test that we raise an exception when the installer file is missing.""" self.assertRaises(prebuilts.PackageFileMissing, self.testDevInstallerPrebuilts, packages=()) - - -if __name__ == '__main__': - cros_test_lib.main() |