From bcd2c693806c5872eaa5ceb32db0eaa343d35710 Mon Sep 17 00:00:00 2001 From: David Shrewsbury Date: Mon, 15 Oct 2012 11:30:15 -0700 Subject: [PATCH] Modify HAProxy driver tests for mock OS services. --- libra/worker/drivers/haproxy/driver.py | 7 +++++-- tests/mock_objects.py | 21 +++++++++++++++++++++ tests/test_haproxy_driver.py | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/libra/worker/drivers/haproxy/driver.py b/libra/worker/drivers/haproxy/driver.py index 82329fa6..b5c8817c 100644 --- a/libra/worker/drivers/haproxy/driver.py +++ b/libra/worker/drivers/haproxy/driver.py @@ -19,8 +19,11 @@ from libra.worker.drivers.haproxy.services_base import ServicesBase class HAProxyDriver(LoadBalancerDriver): - def __init__(self, ossvc='ubuntu_services.UbuntuServices'): - ossvc_driver = import_class('libra.worker.drivers.haproxy.' + ossvc) + def __init__( + self, + ossvc='libra.worker.drivers.haproxy.ubuntu_services.UbuntuServices' + ): + ossvc_driver = import_class(ossvc) self.ossvc = ossvc_driver() if not isinstance(self.ossvc, ServicesBase): raise Exception('Class is not derived from ServicesBase: %s' % diff --git a/tests/mock_objects.py b/tests/mock_objects.py index b43c4707..d6058f9d 100644 --- a/tests/mock_objects.py +++ b/tests/mock_objects.py @@ -1,6 +1,8 @@ import json import logging +from libra.worker.drivers.haproxy.services_base import ServicesBase + class FakeJob(object): def __init__(self, data): @@ -10,6 +12,23 @@ class FakeJob(object): self.data = json.dumps(data) +class FakeOSServices(ServicesBase): + def service_stop(self): + pass + + def service_start(self): + pass + + def service_restart(self): + pass + + def write_config(self): + pass + + def remove_configs(self): + pass + + class MockLoggingHandler(logging.Handler): """Mock logging handler to check for expected logs.""" @@ -28,3 +47,5 @@ class MockLoggingHandler(logging.Handler): 'error': [], 'critical': [], } + + diff --git a/tests/test_haproxy_driver.py b/tests/test_haproxy_driver.py index 84fd6c04..adb10b46 100644 --- a/tests/test_haproxy_driver.py +++ b/tests/test_haproxy_driver.py @@ -4,7 +4,7 @@ from libra.worker.drivers.haproxy.driver import HAProxyDriver class TestHAProxyDriver(unittest.TestCase): def setUp(self): - self.driver = HAProxyDriver() + self.driver = HAProxyDriver('mock_objects.FakeOSServices') def tearDown(self): pass