Merge pull request #1914 from ceph/lock-leaks

supervisor: Disregard nuke-on-error when unlocking

teuthology/dispatcher/supervisor.py

@@ -272,8 +272,7 @@ def unlock_targets(job_config):
     if not locked:
         return
     job_status = get_status(job_info)
-    if job_status == 'pass' or (job_config.get('unlock_on_failure', False)
-                                and not job_config.get('nuke-on-error', False)):
+    if job_status == 'pass' or job_config.get('unlock_on_failure', False):
         log.info('Unlocking machines...')
         fake_ctx = create_fake_context(job_config)
         for machine in locked:

teuthology/test/test_exit.py

@@ -1,11 +1,9 @@
 import os
 import random
-import signal
 
 from unittest.mock import patch, Mock
 
 from teuthology import exit
-from teuthology.test import skipif_teuthology_process
 
 
 class TestExiter(object):
@@ -40,13 +38,6 @@ def teardown_method(self):
         self.patcher_kill.stop()
         del self.m_kill
 
-    @skipif_teuthology_process
-    def test_noop(self):
-        sig = 15
-        obj = self.klass()
-        assert len(obj.handlers) == 0
-        assert signal.getsignal(sig) == 0
-
     def test_basic(self):
         sig = 15
         obj = self.klass()