Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove explicit deprecated module warning catching
they should be catched in main tests __init__
  • Loading branch information
rutsky committed Feb 8, 2016
1 parent 6af7085 commit 6c1a839
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 24 deletions.
3 changes: 1 addition & 2 deletions master/buildbot/test/unit/test_db_workers.py
Expand Up @@ -577,8 +577,7 @@ def tearDown(self):
class TestWorkerTransition(unittest.TestCase):

def test_WorkerBuildStep(self):
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.db.buildslave import BuildslavesConnectorComponent
from buildbot.db.buildslave import BuildslavesConnectorComponent

class C(BuildslavesConnectorComponent):

Expand Down
9 changes: 3 additions & 6 deletions master/buildbot/test/unit/test_process_workerforbuilder.py
Expand Up @@ -84,8 +84,7 @@ def test_worker_old_api(self):
class TestWorkerTransition(TestCase):

def test_abstract_worker_for_builder(self):
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.process.slavebuilder import AbstractSlaveBuilder
from buildbot.process.slavebuilder import AbstractSlaveBuilder

class WB(AbstractSlaveBuilder):

Expand All @@ -100,8 +99,7 @@ def __init__(self):

def test_worker_for_builder(self):
from buildbot.process.workerforbuilder import WorkerForBuilder
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.process.slavebuilder import SlaveBuilder
from buildbot.process.slavebuilder import SlaveBuilder

class WB(SlaveBuilder):

Expand All @@ -116,8 +114,7 @@ def __init__(self):

def test_latent_worker_for_builder(self):
from buildbot.process.workerforbuilder import LatentWorkerForBuilder
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.process.slavebuilder import LatentSlaveBuilder
from buildbot.process.slavebuilder import LatentSlaveBuilder

class WB(LatentSlaveBuilder):

Expand Down
3 changes: 1 addition & 2 deletions master/buildbot/test/unit/test_schedulers_forcesched.py
Expand Up @@ -614,8 +614,7 @@ class TestWorkerTransition(unittest.TestCase):

def test_worker_choice_parameter(self):
from buildbot.schedulers.forcesched import WorkerChoiceParameter
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.schedulers.forcesched import BuildslaveChoiceParameter
from buildbot.schedulers.forcesched import BuildslaveChoiceParameter

class WCP(BuildslaveChoiceParameter):

Expand Down
3 changes: 1 addition & 2 deletions master/buildbot/test/unit/test_steps_worker.py
Expand Up @@ -426,8 +426,7 @@ def test_getFileContentFromWorker_old_api(self):
class TestWorkerTransition(unittest.TestCase):

def test_WorkerBuildStep(self):
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.steps.slave import SlaveBuildStep
from buildbot.steps.slave import SlaveBuildStep

class C(SlaveBuildStep):

Expand Down
9 changes: 3 additions & 6 deletions master/buildbot/test/unit/test_worker_base.py
Expand Up @@ -478,8 +478,7 @@ class TestWorkerTransition(unittest.TestCase):
def test_AbstractBuildSlave_deprecated_worker(self):
from buildbot.worker import AbstractWorker

with ignoreWarning(DeprecatedWorkerModuleWarning):
import buildbot.buildslave as bs
import buildbot.buildslave as bs

with assertProducesWarning(
DeprecatedWorkerNameWarning,
Expand All @@ -491,8 +490,7 @@ def test_AbstractBuildSlave_deprecated_worker(self):
def test_AbstractLatentBuildSlave_deprecated_worker(self):
from buildbot.worker import AbstractLatentWorker

with ignoreWarning(DeprecatedWorkerModuleWarning):
import buildbot.buildslave as bs
import buildbot.buildslave as bs

with assertProducesWarning(
DeprecatedWorkerNameWarning,
Expand All @@ -504,8 +502,7 @@ def test_AbstractLatentBuildSlave_deprecated_worker(self):
def test_BuildSlave_deprecated_worker(self):
from buildbot.worker import Worker

with ignoreWarning(DeprecatedWorkerModuleWarning):
import buildbot.buildslave as bs
import buildbot.buildslave as bs

with assertProducesWarning(
DeprecatedWorkerNameWarning,
Expand Down
3 changes: 1 addition & 2 deletions master/buildbot/test/unit/test_worker_ec2.py
Expand Up @@ -334,8 +334,7 @@ class TestWorkerTransition(unittest.TestCase):

def test_abstract_worker(self):
from buildbot.worker.ec2 import EC2LatentWorker
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.buildslave.ec2 import EC2LatentBuildSlave
from buildbot.buildslave.ec2 import EC2LatentBuildSlave

class Worker(EC2LatentBuildSlave):

Expand Down
3 changes: 1 addition & 2 deletions master/buildbot/test/unit/test_worker_libvirt.py
Expand Up @@ -294,8 +294,7 @@ class TestWorkerTransition(unittest.TestCase):

def test_worker(self):
from buildbot.worker.libvirt import LibVirtWorker
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.buildslave.libvirt import LibVirtSlave
from buildbot.buildslave.libvirt import LibVirtSlave

class Worker(LibVirtSlave):

Expand Down
3 changes: 1 addition & 2 deletions master/buildbot/test/unit/test_worker_openstack.py
Expand Up @@ -188,8 +188,7 @@ class TestWorkerTransition(unittest.TestCase):

def test_worker(self):
from buildbot.worker.openstack import OpenStackLatentWorker
with ignoreWarning(DeprecatedWorkerModuleWarning):
from buildbot.buildslave.openstack import OpenStackLatentBuildSlave
from buildbot.buildslave.openstack import OpenStackLatentBuildSlave

class Worker(OpenStackLatentBuildSlave):

Expand Down

0 comments on commit 6c1a839

Please sign in to comment.