From: Zack Cerza <zack@redhat.com>
Date: Fri, 22 Jan 2016 21:38:58 +0000 (-0700)
Subject: Speed up these tests by ~20x
X-Git-Tag: 1.1.0~694^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F774%2Fhead;p=teuthology.git

Speed up these tests by ~20x

By patching provision.downburst_executable()

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/test/test_vps_os_vers_parameter_checking.py b/teuthology/test/test_vps_os_vers_parameter_checking.py
index b7ba80df..893f8733 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