mirror of
https://github.com/certbot/certbot.git
synced 2026-04-24 15:54:10 -04:00
Merge cdbedc2d46 into 0eb8af20a5
This commit is contained in:
commit
918862ea51
6 changed files with 8 additions and 8 deletions
|
|
@ -110,7 +110,7 @@ class BaseDualNetworkedServersTest(unittest.TestCase):
|
|||
try:
|
||||
self.server_bind()
|
||||
self.server_activate()
|
||||
except:
|
||||
except Exception:
|
||||
self.server_close()
|
||||
raise
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class DNSServer:
|
|||
try:
|
||||
self._configure_bind()
|
||||
self._start_bind()
|
||||
except:
|
||||
except Exception:
|
||||
self.stop()
|
||||
raise
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ class DNSServer:
|
|||
|
||||
try:
|
||||
self._wait_until_ready()
|
||||
except:
|
||||
except Exception:
|
||||
# The container might be running even if we think it isn't
|
||||
self.stop()
|
||||
raise
|
||||
|
|
|
|||
|
|
@ -794,7 +794,7 @@ class Client:
|
|||
try:
|
||||
self.installer.rollback_checkpoints()
|
||||
self.installer.restart()
|
||||
except:
|
||||
except Exception:
|
||||
logger.error(
|
||||
"An error occurred and we failed to restore your config and "
|
||||
"restart your server. Please post to "
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ class TempUmaskTests(test_util.TempDirTestCase):
|
|||
with filesystem.temp_umask(0o0077):
|
||||
assert self._check_umask() == 0o0077
|
||||
raise Exception()
|
||||
except:
|
||||
except Exception:
|
||||
assert self._check_umask() == 0o0022
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1475,7 +1475,7 @@ class MainTest(test_util.ConfigTestCase):
|
|||
mock_client.obtain_certificate.assert_called_once_with([mock.ANY], None)
|
||||
else:
|
||||
assert mock_client.obtain_certificate.call_count == 0
|
||||
except:
|
||||
except Exception:
|
||||
self._dump_log()
|
||||
raise
|
||||
finally:
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ def test_client_process(fab_config, inqueue, outqueue, log_dir):
|
|||
install_and_launch_certbot(cxn, instance, target, log_dir)
|
||||
outqueue.put((ii, target, Status.PASS))
|
||||
print("%s - %s SUCCESS"%(target['ami'], target['name']))
|
||||
except:
|
||||
except Exception:
|
||||
outqueue.put((ii, target, Status.FAIL))
|
||||
print("%s - %s FAIL"%(target['ami'], target['name']))
|
||||
traceback.print_exc(file=sys.stdout)
|
||||
|
|
@ -329,7 +329,7 @@ def test_client_process(fab_config, inqueue, outqueue, log_dir):
|
|||
print("\n\ncertbot.log\n" + "-"*80 + "\n")
|
||||
try:
|
||||
grab_certbot_log(cxn)
|
||||
except:
|
||||
except Exception:
|
||||
print("log fail\n")
|
||||
traceback.print_exc(file=sys.stdout)
|
||||
pass
|
||||
|
|
|
|||
Loading…
Reference in a new issue