Revert "[autotest] Threaded asynchronous task execution on drones."
Problems with the retry decorator and localhost threads.
This reverts commit 0933899b0dd1320e90e06025cced8096aed44908.
Change-Id: I99318b4bdf4c11e9c4e5181c4ff5b1bdcdcbb89c
Reviewed-on: https://chromium-review.googlesource.com/207038
Reviewed-by: Prashanth B <beeps@chromium.org>
Commit-Queue: Prashanth B <beeps@chromium.org>
Tested-by: Prashanth B <beeps@chromium.org>
diff --git a/scheduler/drones_unittest.py b/scheduler/drones_unittest.py
index a3c3953..d395288 100755
--- a/scheduler/drones_unittest.py
+++ b/scheduler/drones_unittest.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-#pylint: disable-msg=C0111
"""Tests for autotest_lib.scheduler.drones."""
@@ -13,13 +12,11 @@
class RemoteDroneTest(unittest.TestCase):
-
def setUp(self):
self.god = mock.mock_god()
self._mock_host = self.god.create_mock_class(ssh_host.SSHHost,
'mock SSHHost')
self.god.stub_function(drones.drone_utility, 'create_host')
- self.drone_utility_path = 'mock-drone-utility-path'
def tearDown(self):
@@ -36,43 +33,22 @@
def test_execute_calls_impl(self):
self.god.stub_with(drones._RemoteDrone, '_drone_utility_path',
- self.drone_utility_path)
+ 'mock-drone-utility-path')
drones.drone_utility.create_host.expect_call('fakehost').and_return(
self._mock_host)
self._mock_host.is_up.expect_call().and_return(True)
mock_calls = ('foo',)
mock_result = utils.CmdResult(stdout=cPickle.dumps('mock return'))
self._mock_host.run.expect_call(
- 'python %s' % self.drone_utility_path,
+ 'python mock-drone-utility-path',
stdin=cPickle.dumps(mock_calls), stdout_tee=None,
connect_timeout=mock.is_instance_comparator(int)).and_return(
mock_result)
+
drone = drones._RemoteDrone('fakehost')
self.assertEqual('mock return', drone._execute_calls_impl(mock_calls))
self.god.check_playback()
- def test_execute_queued_calls(self):
- self.god.stub_with(drones._RemoteDrone, '_drone_utility_path',
- self.drone_utility_path)
- drones.drone_utility.create_host.expect_call('fakehost').and_return(
- self._mock_host)
- self._mock_host.is_up.expect_call().and_return(True)
- drone = drones._RemoteDrone('fakehost')
- mock_return={}
- mock_return['results'] = ['mock return']
- mock_return['warnings'] = []
- drone.queue_call('foo')
- mock_result = utils.CmdResult(stdout=cPickle.dumps(mock_return))
- self._mock_host.run.expect_call(
- 'python %s' % self.drone_utility_path,
- stdin=cPickle.dumps(drone.get_calls()), stdout_tee=None,
- connect_timeout=mock.is_instance_comparator(int)).and_return(
- mock_result)
- self.assertEqual(mock_return['results'], drone.execute_queued_calls())
- self.god.check_playback()
-
-
-
if __name__ == '__main__':
unittest.main()