Actually implement instance disposal.

2 files changed, 58 insertions, 3 deletions

diff --git a/testrepository/testcommand.py b/testrepository/testcommand.py
index 75c15f8..4db5f23 100644
--- a/testrepository/testcommand.py
+++ b/testrepository/testcommand.py
@@ -346,8 +346,26 @@ class TestCommand(Fixture):
 
     def setUp(self):
         super(TestCommand, self).setUp()
-        self._instances = set()
-        self.addCleanup(setattr, self, '_instances', None)
+        self._instances = set(['qwe'])
+        self.addCleanup(self._dispose_instances)
+
+    def _dispose_instances(self):
+        instances = self._instances
+        if instances is None:
+            return
+        self._instances = None
+        try:
+            dispose_cmd = self.get_parser().get('DEFAULT', 'instance_dispose')
+        except (ValueError, ConfigParser.NoOptionError):
+            return
+        variable_regex = '\$INSTANCE_IDS'
+        dispose_cmd = re.sub(variable_regex, ' ' .join(instances), dispose_cmd)
+        self.ui.output_values([('running', dispose_cmd)])
+        run_proc = self.ui.subprocess_Popen(dispose_cmd, shell=True)
+        run_proc.communicate()
+        if run_proc.returncode:
+            raise ValueError('Disposing of instances failed, return %d' %
+                run_proc.returncode)
 
     def get_parser(self):
         """Get a parser with the .testr.conf in it."""
diff --git a/testrepository/tests/test_testcommand.py b/testrepository/tests/test_testcommand.py
index 1673e35..3fd8e97 100644
--- a/testrepository/tests/test_testcommand.py
+++ b/testrepository/tests/test_testcommand.py
@@ -76,9 +76,46 @@ class TestTestCommand(ResourcedTestCase):
         self.assertEqual(command.ui, ui)
 
     def test_TestCommand_is_a_fixture(self):
-        ui, command = self.get_test_ui_and_cmd()
+        ui = UI()
+        ui.here = self.tempdir
+        command = TestCommand(ui, None)
+        command.setUp()
+        command.cleanUp()
+
+    def test_TestCommand_get_run_command_outside_setUp_fails(self):
+        self.dirty()
+        ui = UI()
+        ui.here = self.tempdir
+        command = TestCommand(ui, None)
+        self.set_config('[DEFAULT]\ntest_command=foo\n')
+        self.assertThat(command.get_run_command, raises(TypeError))
         command.setUp()
         command.cleanUp()
+        self.assertThat(command.get_run_command, raises(TypeError))
+
+    def test_TestCommand_cleanUp_disposes_instances(self):
+        ui, command = self.get_test_ui_and_cmd()
+        self.set_config(
+            '[DEFAULT]\ntest_command=foo\n'
+            'instance_dispose=bar $INSTANCE_IDS\n')
+        command._instances.update(['baz', 'quux'])
+        command.cleanUp()
+        command.setUp()
+        self.assertEqual([
+            ('values', [('running', 'bar quux qwe baz')]),
+            ('popen', ('bar quux qwe baz',), {'shell': True}),
+            ('communicate',)], ui.outputs)
+
+    def test_TestCommand_cleanUp_disposes_instances_fail_raises(self):
+        ui, command = self.get_test_ui_and_cmd()
+        ui.proc_results = [1]
+        self.set_config(
+            '[DEFAULT]\ntest_command=foo\n'
+            'instance_dispose=bar $INSTANCE_IDS\n')
+        command._instances.update(['baz', 'quux'])
+        self.assertThat(command.cleanUp,
+            raises(ValueError('Disposing of instances failed, return 1')))
+        command.setUp()
 
     def test_get_run_command_no_config_file_errors(self):
         ui, command = self.get_test_ui_and_cmd()