summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cbuildbot/stages/artifact_stages_unittest.py14
-rw-r--r--cbuildbot/stages/branch_stages_unittest.py2
-rw-r--r--cbuildbot/stages/build_stages_unittest.py10
-rw-r--r--cbuildbot/stages/chrome_stages_unittest.py4
-rw-r--r--cbuildbot/stages/completion_stages_unittest.py10
-rw-r--r--cbuildbot/stages/generic_stages_unittest.py16
-rw-r--r--cbuildbot/stages/release_stages_unittest.py2
-rw-r--r--cbuildbot/stages/report_stages_unittest.py11
-rw-r--r--cbuildbot/stages/sdk_stages_unittest.py7
-rw-r--r--cbuildbot/stages/sync_stages_unittest.py5
-rw-r--r--cbuildbot/stages/test_stages_unittest.py10
11 files changed, 48 insertions, 43 deletions
diff --git a/cbuildbot/stages/artifact_stages_unittest.py b/cbuildbot/stages/artifact_stages_unittest.py
index 31cc287ff..d18909e88 100644
--- a/cbuildbot/stages/artifact_stages_unittest.py
+++ b/cbuildbot/stages/artifact_stages_unittest.py
@@ -37,7 +37,7 @@ DEFAULT_CHROME_BRANCH = '27'
# pylint: disable=too-many-ancestors
-class ArchiveStageTest(generic_stages_unittest.AbstractStageTest):
+class ArchiveStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Exercise ArchiveStage functionality."""
# pylint: disable=protected-access
@@ -113,7 +113,7 @@ class ArchiveStageTest(generic_stages_unittest.AbstractStageTest):
class UploadPrebuiltsStageTest(
- generic_stages_unittest.RunCommandAbstractStageTest):
+ generic_stages_unittest.RunCommandAbstractStageTestCase):
"""Tests for the UploadPrebuilts stage."""
cmd = 'upload_prebuilts'
@@ -175,7 +175,7 @@ class UploadPrebuiltsStageTest(
class MasterUploadPrebuiltsStageTest(
- generic_stages_unittest.RunCommandAbstractStageTest):
+ generic_stages_unittest.RunCommandAbstractStageTestCase):
"""Tests for the MasterUploadPrebuilts stage."""
cmd = 'upload_prebuilts'
@@ -267,7 +267,7 @@ class MasterUploadPrebuiltsStageTest(
class UploadDevInstallerPrebuiltsStageTest(
- generic_stages_unittest.AbstractStageTest):
+ generic_stages_unittest.AbstractStageTestCase):
"""Tests for the UploadDevInstallerPrebuilts stage."""
RELEASE_TAG = 'RT'
@@ -307,7 +307,7 @@ class UploadDevInstallerPrebuiltsStageTest(
extra_args=mock.ANY)
-class CPEExportStageTest(generic_stages_unittest.AbstractStageTest):
+class CPEExportStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Test CPEExportStage"""
def setUp(self):
@@ -343,7 +343,7 @@ class CPEExportStageTest(generic_stages_unittest.AbstractStageTest):
self._TestPerformStage()
-class DebugSymbolsStageTest(generic_stages_unittest.AbstractStageTest):
+class DebugSymbolsStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Test DebugSymbolsStage"""
# pylint: disable=protected-access
@@ -571,7 +571,7 @@ class ArchivingMock(partial_mock.PartialMock):
# TODO: Delete ArchivingStageTest once ArchivingStage is deprecated.
-class ArchivingStageTest(generic_stages_unittest.AbstractStageTest):
+class ArchivingStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Excerise ArchivingStage functionality."""
RELEASE_TAG = ''
diff --git a/cbuildbot/stages/branch_stages_unittest.py b/cbuildbot/stages/branch_stages_unittest.py
index 8617fa7cd..66288ea26 100644
--- a/cbuildbot/stages/branch_stages_unittest.py
+++ b/cbuildbot/stages/branch_stages_unittest.py
@@ -125,7 +125,7 @@ upstream="old-special-branch"/>
special_revision2=SPECIAL_REVISION2)
-class BranchUtilStageTest(generic_stages_unittest.AbstractStageTest,
+class BranchUtilStageTest(generic_stages_unittest.AbstractStageTestCase,
cros_test_lib.LoggingTestCase):
"""Tests for branch creation/deletion."""
diff --git a/cbuildbot/stages/build_stages_unittest.py b/cbuildbot/stages/build_stages_unittest.py
index dcce5a6ab..0c5ebcffc 100644
--- a/cbuildbot/stages/build_stages_unittest.py
+++ b/cbuildbot/stages/build_stages_unittest.py
@@ -31,7 +31,7 @@ from chromite.cbuildbot.stages.generic_stages_unittest import patches
# pylint: disable=too-many-ancestors
-class InitSDKTest(generic_stages_unittest.RunCommandAbstractStageTest):
+class InitSDKTest(generic_stages_unittest.RunCommandAbstractStageTestCase):
"""Test building the SDK"""
# pylint: disable=protected-access
@@ -83,7 +83,7 @@ class InitSDKTest(generic_stages_unittest.RunCommandAbstractStageTest):
enter_chroot=True, extra_env={'USE': 'foo'})
-class SetupBoardTest(generic_stages_unittest.RunCommandAbstractStageTest):
+class SetupBoardTest(generic_stages_unittest.RunCommandAbstractStageTestCase):
"""Test building the board"""
def ConstructStage(self):
@@ -169,7 +169,7 @@ class SetupBoardTest(generic_stages_unittest.RunCommandAbstractStageTest):
self.assertCommandContains(['./setup_board', '--skip_chroot_upgrade'])
-class UprevStageTest(generic_stages_unittest.AbstractStageTest):
+class UprevStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests for the UprevStage class."""
def setUp(self):
@@ -193,12 +193,12 @@ class UprevStageTest(generic_stages_unittest.AbstractStageTest):
self.assertFalse(self.uprev_mock.called)
-class AllConfigsTestCase(generic_stages_unittest.AbstractStageTest):
+class AllConfigsTestCase(generic_stages_unittest.AbstractStageTestCase):
"""Test case for testing against all bot configs."""
def ConstructStage(self):
"""Bypass lint warning"""
- generic_stages_unittest.AbstractStageTest.ConstructStage(self)
+ generic_stages_unittest.AbstractStageTestCase.ConstructStage(self)
@contextlib.contextmanager
def RunStageWithConfig(self, mock_configurator=None):
diff --git a/cbuildbot/stages/chrome_stages_unittest.py b/cbuildbot/stages/chrome_stages_unittest.py
index ebe4712f5..8f5e77838 100644
--- a/cbuildbot/stages/chrome_stages_unittest.py
+++ b/cbuildbot/stages/chrome_stages_unittest.py
@@ -22,7 +22,7 @@ from chromite.lib import osutils
from chromite.lib import parallel_unittest
-class ChromeSDKStageTest(generic_stages_unittest.AbstractStageTest,
+class ChromeSDKStageTest(generic_stages_unittest.AbstractStageTestCase,
cros_test_lib.LoggingTestCase):
"""Verify stage that creates the chrome-sdk and builds chrome with it."""
BOT_ID = 'link-paladin'
@@ -84,7 +84,7 @@ class ChromeSDKStageTest(generic_stages_unittest.AbstractStageTest,
cros_test_lib.VerifyTarball(env_tar, ['./', 'environment'])
-class PatchChromeStageTest(generic_stages_unittest.AbstractStageTest):
+class PatchChromeStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests for PatchChromeStage."""
def setUp(self):
diff --git a/cbuildbot/stages/completion_stages_unittest.py b/cbuildbot/stages/completion_stages_unittest.py
index f3d252ebf..aa64f029d 100644
--- a/cbuildbot/stages/completion_stages_unittest.py
+++ b/cbuildbot/stages/completion_stages_unittest.py
@@ -103,7 +103,7 @@ class ManifestVersionedSyncCompletionStageTest(
class MasterSlaveSyncCompletionStageTest(
- generic_stages_unittest.AbstractStageTest):
+ generic_stages_unittest.AbstractStageTestCase):
"""Tests MasterSlaveSyncCompletionStage with ManifestVersionedSyncStage."""
BOT_ID = 'x86-generic-paladin'
@@ -252,7 +252,7 @@ class MasterSlaveSyncCompletionStageTestWithLKGMSync(
class CanaryCompletionStageTest(
- generic_stages_unittest.AbstractStageTest):
+ generic_stages_unittest.AbstractStageTestCase):
"""Tests how canary master handles failures in CanaryCompletionStage."""
BOT_ID = 'master-release'
@@ -281,7 +281,8 @@ class CanaryCompletionStageTest(
class BaseCommitQueueCompletionStageTest(
- generic_stages_unittest.AbstractStageTest, patch_unittest.MockPatchBase):
+ generic_stages_unittest.AbstractStageTestCase,
+ patch_unittest.MockPatchBase):
"""Tests how CQ handles changes in CommitQueueCompletionStage."""
def setUp(self):
@@ -578,7 +579,8 @@ class MasterCommitQueueCompletionStageTest(BaseCommitQueueCompletionStageTest):
stage=stage)
-class PublishUprevChangesStageTest(generic_stages_unittest.AbstractStageTest):
+class PublishUprevChangesStageTest(
+ generic_stages_unittest.AbstractStageTestCase):
"""Tests for the PublishUprevChanges stage."""
def setUp(self):
diff --git a/cbuildbot/stages/generic_stages_unittest.py b/cbuildbot/stages/generic_stages_unittest.py
index b7939c703..99c9932ca 100644
--- a/cbuildbot/stages/generic_stages_unittest.py
+++ b/cbuildbot/stages/generic_stages_unittest.py
@@ -41,8 +41,8 @@ DEFAULT_BUILD_STAGE_ID = 313377
# The inheritence order ensures the patchers are stopped before
# cleaning up the temporary directories.
-class StageTest(cros_test_lib.MockOutputTestCase,
- cros_test_lib.TempDirTestCase):
+class StageTestCase(cros_test_lib.MockOutputTestCase,
+ cros_test_lib.TempDirTestCase):
"""Test running a single stage in isolation."""
TARGET_MANIFEST_BRANCH = 'ooga_booga'
@@ -209,7 +209,7 @@ class StageTest(cros_test_lib.MockOutputTestCase,
self.fail('%s raised instead of %s' % (e, exception))
-class AbstractStageTest(StageTest):
+class AbstractStageTestCase(StageTestCase):
"""Base class for tests that test a particular build stage.
Abstract base class that sets up the build config and options with some
@@ -258,7 +258,7 @@ def patches(*args):
yield
-class BuilderStageTest(AbstractStageTest):
+class BuilderStageTest(AbstractStageTestCase):
"""Tests for BuilderStage class."""
def setUp(self):
@@ -419,7 +419,7 @@ class BuilderStageTest(AbstractStageTest):
constants.BUILDER_STATUS_FAILED)
-class BoardSpecificBuilderStageTest(AbstractStageTest):
+class BoardSpecificBuilderStageTest(AbstractStageTestCase):
"""Tests option/config settings on board-specific stages."""
DEFAULT_BOARD_NAME = 'my_shiny_test_board'
@@ -456,8 +456,8 @@ class BoardSpecificBuilderStageTest(AbstractStageTest):
# 'cbuildbot_config._settings') % (attr, obj.config_name))
-class RunCommandAbstractStageTest(AbstractStageTest,
- cros_build_lib_unittest.RunCommandTestCase):
+class RunCommandAbstractStageTestCase(
+ AbstractStageTestCase, cros_build_lib_unittest.RunCommandTestCase):
"""Base test class for testing a stage and mocking RunCommand."""
# pylint: disable=abstract-method
@@ -466,7 +466,7 @@ class RunCommandAbstractStageTest(AbstractStageTest,
BIN_BOT_ID = 'x86-generic-paladin'
def _Prepare(self, bot_id, **kwargs):
- super(RunCommandAbstractStageTest, self)._Prepare(bot_id, **kwargs)
+ super(RunCommandAbstractStageTestCase, self)._Prepare(bot_id, **kwargs)
def _PrepareFull(self, **kwargs):
self._Prepare(self.FULL_BOT_ID, **kwargs)
diff --git a/cbuildbot/stages/release_stages_unittest.py b/cbuildbot/stages/release_stages_unittest.py
index 713c2e4c7..a435605e8 100644
--- a/cbuildbot/stages/release_stages_unittest.py
+++ b/cbuildbot/stages/release_stages_unittest.py
@@ -25,7 +25,7 @@ from chromite.lib.paygen import paygen_build_lib
# pylint: disable=protected-access
-class PaygenStageTest(generic_stages_unittest.AbstractStageTest):
+class PaygenStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Test the PaygenStageStage."""
BOT_ID = 'x86-mario-release'
diff --git a/cbuildbot/stages/report_stages_unittest.py b/cbuildbot/stages/report_stages_unittest.py
index 2a5ea6ae5..47a5d4a70 100644
--- a/cbuildbot/stages/report_stages_unittest.py
+++ b/cbuildbot/stages/report_stages_unittest.py
@@ -33,7 +33,7 @@ from chromite.lib import toolchain
# pylint: disable=protected-access
-class BuildReexecutionStageTest(generic_stages_unittest.AbstractStageTest):
+class BuildReexecutionStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests that BuildReexecutionFinishedStage behaves as expected."""
def setUp(self):
self.fake_db = fake_cidb.FakeCIDBConnection()
@@ -79,7 +79,7 @@ class BuildReexecutionStageTest(generic_stages_unittest.AbstractStageTest):
def ConstructStage(self):
return report_stages.BuildReexecutionFinishedStage(self._run)
-class BuildStartStageTest(generic_stages_unittest.AbstractStageTest):
+class BuildStartStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests that BuildStartStage behaves as expected."""
def setUp(self):
@@ -143,7 +143,8 @@ class BuildStartStageTest(generic_stages_unittest.AbstractStageTest):
return report_stages.BuildStartStage(self._run)
-class AbstractReportStageTest(generic_stages_unittest.AbstractStageTest):
+class AbstractReportStageTestCase(
+ generic_stages_unittest.AbstractStageTestCase):
"""Base class for testing the Report stage."""
def setUp(self):
@@ -180,7 +181,7 @@ class AbstractReportStageTest(generic_stages_unittest.AbstractStageTest):
return report_stages.ReportStage(self._run, self.sync_stage, None)
-class ReportStageTest(AbstractReportStageTest):
+class ReportStageTest(AbstractReportStageTestCase):
"""Test the Report stage."""
RELEASE_TAG = ''
@@ -274,7 +275,7 @@ class ReportStageTest(AbstractReportStageTest):
self.assertEqual(expected, child_config_list)
-class ReportStageNoSyncTest(AbstractReportStageTest):
+class ReportStageNoSyncTest(AbstractReportStageTestCase):
"""Test the Report stage if SyncStage didn't complete.
If SyncStage doesn't complete, we don't know the release tag, and can't
diff --git a/cbuildbot/stages/sdk_stages_unittest.py b/cbuildbot/stages/sdk_stages_unittest.py
index ca0c3b288..fb3b407e1 100644
--- a/cbuildbot/stages/sdk_stages_unittest.py
+++ b/cbuildbot/stages/sdk_stages_unittest.py
@@ -19,7 +19,8 @@ from chromite.lib import perf_uploader
from chromite.lib import portage_util
-class SDKBuildToolchainsStageTest(generic_stages_unittest.AbstractStageTest):
+class SDKBuildToolchainsStageTest(
+ generic_stages_unittest.AbstractStageTestCase):
"""Tests SDK toolchain building."""
def setUp(self):
@@ -44,7 +45,7 @@ class SDKBuildToolchainsStageTest(generic_stages_unittest.AbstractStageTest):
self.assertTrue(isinstance(ele, basestring))
-class SDKPackageStageTest(generic_stages_unittest.AbstractStageTest):
+class SDKPackageStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests SDK package and Manifest creation."""
fake_packages = (('cat1/package', '1'), ('cat1/package', '2'),
@@ -176,7 +177,7 @@ class SDKPackageStageTest(generic_stages_unittest.AbstractStageTest):
self.assertEqual(kwargs['revision'], 123456)
-class SDKTestStageTest(generic_stages_unittest.AbstractStageTest):
+class SDKTestStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests SDK test phase."""
def setUp(self):
diff --git a/cbuildbot/stages/sync_stages_unittest.py b/cbuildbot/stages/sync_stages_unittest.py
index 5995a2e7f..5f59b0e1d 100644
--- a/cbuildbot/stages/sync_stages_unittest.py
+++ b/cbuildbot/stages/sync_stages_unittest.py
@@ -43,7 +43,8 @@ from chromite.lib import timeout_util
# It's normal for unittests to access protected members.
# pylint: disable=protected-access
-class ManifestVersionedSyncStageTest(generic_stages_unittest.AbstractStageTest):
+class ManifestVersionedSyncStageTest(
+ generic_stages_unittest.AbstractStageTestCase):
"""Tests the ManifestVersionedSync stage."""
# pylint: disable=abstract-method
@@ -185,7 +186,7 @@ class MockPatch(mock.MagicMock):
def GetDiffStatus(self, _):
return self.mock_diff_status
-class BaseCQTestCase(generic_stages_unittest.StageTest):
+class BaseCQTestCase(generic_stages_unittest.StageTestCase):
"""Helper class for testing the CommitQueueSync stage"""
MANIFEST_CONTENTS = '<manifest/>'
diff --git a/cbuildbot/stages/test_stages_unittest.py b/cbuildbot/stages/test_stages_unittest.py
index 338fbae73..e4eaba57f 100644
--- a/cbuildbot/stages/test_stages_unittest.py
+++ b/cbuildbot/stages/test_stages_unittest.py
@@ -26,7 +26,7 @@ from chromite.lib import osutils
from chromite.lib import timeout_util
-class VMTestStageTest(generic_stages_unittest.AbstractStageTest):
+class VMTestStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests for the VMTest stage."""
BOT_ID = 'x86-generic-full'
@@ -80,7 +80,7 @@ class VMTestStageTest(generic_stages_unittest.AbstractStageTest):
self.assertRaises(failures_lib.InfrastructureFailure, stage.PerformStage)
-class UnitTestStageTest(generic_stages_unittest.AbstractStageTest):
+class UnitTestStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests for the UnitTest stage."""
BOT_ID = 'x86-generic-full'
@@ -138,7 +138,7 @@ class UnitTestStageTest(generic_stages_unittest.AbstractStageTest):
self.testauzip_mock.assert_called_once_with(self.build_root, self.image_dir)
-class HWTestStageTest(generic_stages_unittest.AbstractStageTest):
+class HWTestStageTest(generic_stages_unittest.AbstractStageTestCase):
"""Tests for the HWTest stage."""
BOT_ID = 'x86-mario-release'
@@ -362,7 +362,7 @@ class HWTestStageTest(generic_stages_unittest.AbstractStageTest):
constants.HWTEST_DEFAULT_PRIORITY)
-class AUTestStageTest(generic_stages_unittest.AbstractStageTest,
+class AUTestStageTest(generic_stages_unittest.AbstractStageTestCase,
cros_build_lib_unittest.RunCommandTestCase):
"""Test only custom methods in AUTestStageTest."""
BOT_ID = 'x86-mario-release'
@@ -425,7 +425,7 @@ class AUTestStageTest(generic_stages_unittest.AbstractStageTest,
self.assertFalse(self.run_suite_mock.called)
-class ImageTestStageTest(generic_stages_unittest.AbstractStageTest,
+class ImageTestStageTest(generic_stages_unittest.AbstractStageTestCase,
cros_build_lib_unittest.RunCommandTestCase):
"""Test image test stage."""
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 19:36:43 +0000