From 122af4c5e6c291ee32ddb18f09a269cbca1952db Mon Sep 17 00:00:00 2001 From: Yuriy Zveryanskyy Date: Thu, 20 Mar 2014 12:19:39 +0200 Subject: [PATCH] Decrease running time of SeaMicro driver tests Modify config options in SeaMicro driver unit tests for considerable decrease running time. Change-Id: I643e9ba6cf16e37a945b9017c59db96b80bb2270 --- ironic/tests/drivers/test_seamicro.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ironic/tests/drivers/test_seamicro.py b/ironic/tests/drivers/test_seamicro.py index c2f891a7c5..a1aa064a60 100644 --- a/ironic/tests/drivers/test_seamicro.py +++ b/ironic/tests/drivers/test_seamicro.py @@ -141,6 +141,8 @@ class SeaMicroPrivateMethodsTestCase(base.TestCase): self.Server = Fake_Server self.Volume = Fake_Volume self.Pool = Fake_Pool + self.config(action_timeout=0, group='seamicro') + self.config(max_retry=2, group='seamicro') def _create_test_node(self, **kwargs): n = db_utils.get_test_node(**kwargs) @@ -167,7 +169,7 @@ class SeaMicroPrivateMethodsTestCase(base.TestCase): @mock.patch.object(seamicro, "_get_server") def test__power_on_good(self, mock_get_server): mock_get_server.return_value = self.Server(active=False) - pstate = seamicro._power_on(self.node, timeout=2) + pstate = seamicro._power_on(self.node) self.assertEqual(states.POWER_ON, pstate) @mock.patch.object(seamicro, "_get_server") @@ -178,13 +180,13 @@ class SeaMicroPrivateMethodsTestCase(base.TestCase): server = self.Server(active=False) server.power_on = fake_power_on mock_get_server.return_value = server - pstate = seamicro._power_on(self.node, timeout=2) + pstate = seamicro._power_on(self.node) self.assertEqual(states.ERROR, pstate) @mock.patch.object(seamicro, "_get_server") def test__power_off_good(self, mock_get_server): mock_get_server.return_value = self.Server(active=True) - pstate = seamicro._power_off(self.node, timeout=2) + pstate = seamicro._power_off(self.node) self.assertEqual(states.POWER_OFF, pstate) @mock.patch.object(seamicro, "_get_server") @@ -194,13 +196,13 @@ class SeaMicroPrivateMethodsTestCase(base.TestCase): server = self.Server(active=True) server.power_off = fake_power_off mock_get_server.return_value = server - pstate = seamicro._power_off(self.node, timeout=2) + pstate = seamicro._power_off(self.node) self.assertEqual(states.ERROR, pstate) @mock.patch.object(seamicro, "_get_server") def test__reboot_good(self, mock_get_server): mock_get_server.return_value = self.Server(active=True) - pstate = seamicro._reboot(self.node, timeout=2) + pstate = seamicro._reboot(self.node) self.assertEqual(states.POWER_ON, pstate) @mock.patch.object(seamicro, "_get_server") @@ -210,7 +212,7 @@ class SeaMicroPrivateMethodsTestCase(base.TestCase): server = self.Server(active=False) server.reset = fake_reboot mock_get_server.return_value = server - pstate = seamicro._reboot(self.node, timeout=2) + pstate = seamicro._reboot(self.node) self.assertEqual(states.ERROR, pstate) @mock.patch.object(seamicro, "_get_volume")