Merge pull request #2562 from cdonati/unblock-tests

Mock out blocking calls in unit tests
AppScale · Oct 26, 2017 · 26b76b2 · 26b76b2
2 parents d8b37e9 + 86806a2
commit 26b76b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/AppDB/test/unit/test_cassandra_backup.py b/AppDB/test/unit/test_cassandra_backup.py
@@ -3,6 +3,7 @@
 import re
 import sys
 import subprocess
+import time
 import unittest
 from flexmock import flexmock
 
@@ -102,6 +103,8 @@ def test_restore_data(self):
     flexmock(rebalance).should_receive('get_status').and_return(
       [{'state': 'UN'} for _ in db_ips])
 
+    flexmock(time).should_receive('sleep')
+
     cassandra_backup.restore_data(path, keyname)
 
 

diff --git a/InfrastructureManager/tests/test_ec2_agent.py b/InfrastructureManager/tests/test_ec2_agent.py
@@ -123,6 +123,7 @@ def terminate_instances(self, prefix, blocking):
     reservation.instances = [instance]
     self.fake_ec2.should_receive('get_all_instances').and_return([reservation])
 
+    flexmock(i).should_receive('_InfrastructureManager__kill_vms')
     result = i.terminate_instances(params2, 'secret')
     if not blocking:
       time.sleep(.1)