From 4843b92a803e129e3de029a13e4ba78b88ef75bf Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 22 Jan 2016 14:38:58 -0700 Subject: [PATCH] Speed up these tests by ~20x By patching provision.downburst_executable() Signed-off-by: Zack Cerza --- .../test_vps_os_vers_parameter_checking.py | 67 +++++++++++++------ 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/teuthology/test/test_vps_os_vers_parameter_checking.py b/teuthology/test/test_vps_os_vers_parameter_checking.py index b7ba80df5..893f87333 100644 --- a/teuthology/test/test_vps_os_vers_parameter_checking.py +++ b/teuthology/test/test_vps_os_vers_parameter_checking.py @@ -1,3 +1,5 @@ +from mock import patch + from .. import lock class Mock: pass @@ -10,49 +12,74 @@ class TestVpsOsVersionParamCheck(object): self.fake_ctx.num_to_lock = 1 self.fake_ctx.lock = False + def fake_downburst_executable(): + return '' + + self.fake_downburst_executable = fake_downburst_executable + def test_ubuntu_precise(self): self.fake_ctx.os_type = 'ubuntu' self.fake_ctx.os_version = 'precise' - check_value = lock.vps_version_or_type_valid( - self.fake_ctx.machine_type, - self.fake_ctx.os_type, - self.fake_ctx.os_version) + with patch.multiple( + lock.provision, + downburst_executable=self.fake_downburst_executable, + ): + check_value = lock.vps_version_or_type_valid( + self.fake_ctx.machine_type, + self.fake_ctx.os_type, + self.fake_ctx.os_version) assert check_value def test_ubuntu_number(self): self.fake_ctx.os_type = 'ubuntu' self.fake_ctx.os_version = '12.04' - check_value = lock.vps_version_or_type_valid( - self.fake_ctx.machine_type, - self.fake_ctx.os_type, - self.fake_ctx.os_version) + with patch.multiple( + lock.provision, + downburst_executable=self.fake_downburst_executable, + ): + check_value = lock.vps_version_or_type_valid( + self.fake_ctx.machine_type, + self.fake_ctx.os_type, + self.fake_ctx.os_version) assert check_value def test_mixup(self): self.fake_ctx.os_type = '6.5' self.fake_ctx.os_version = 'rhel' - check_value = lock.vps_version_or_type_valid( - self.fake_ctx.machine_type, - self.fake_ctx.os_type, - self.fake_ctx.os_version) + with patch.multiple( + lock.provision, + downburst_executable=self.fake_downburst_executable, + ): + check_value = lock.vps_version_or_type_valid( + self.fake_ctx.machine_type, + self.fake_ctx.os_type, + self.fake_ctx.os_version) assert not check_value def test_bad_type(self): self.fake_ctx.os_type = 'aardvark' self.fake_ctx.os_version = '6.5' - check_value = lock.vps_version_or_type_valid( - self.fake_ctx.machine_type, - self.fake_ctx.os_type, - self.fake_ctx.os_version) + with patch.multiple( + lock.provision, + downburst_executable=self.fake_downburst_executable, + ): + check_value = lock.vps_version_or_type_valid( + self.fake_ctx.machine_type, + self.fake_ctx.os_type, + self.fake_ctx.os_version) assert not check_value def test_bad_version(self): self.fake_ctx.os_type = 'rhel' self.fake_ctx.os_version = 'vampire_bat' - check_value = lock.vps_version_or_type_valid( - self.fake_ctx.machine_type, - self.fake_ctx.os_type, - self.fake_ctx.os_version) + with patch.multiple( + lock.provision, + downburst_executable=self.fake_downburst_executable, + ): + check_value = lock.vps_version_or_type_valid( + self.fake_ctx.machine_type, + self.fake_ctx.os_type, + self.fake_ctx.os_version) assert not check_value -- 2.47.3