From b36f98d388496d45f182f7bba6c4ebb5e9acefce Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 19 Jul 2020 17:38:09 +0800 Subject: [PATCH] qa/tasks/samba: drop python2 support Signed-off-by: Kefu Chai --- qa/tasks/samba.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/qa/tasks/samba.py b/qa/tasks/samba.py index 1dd62d8624c..280f5342d3a 100644 --- a/qa/tasks/samba.py +++ b/qa/tasks/samba.py @@ -3,11 +3,8 @@ Samba """ import contextlib import logging -import sys import time -import six - from teuthology import misc as teuthology from teuthology.orchestra import run from teuthology.orchestra.daemon import DaemonGroup @@ -24,7 +21,7 @@ def get_sambas(ctx, roles): :param roles: roles for this test (extracted from yaml files) """ for role in roles: - assert isinstance(role, six.string_types) + assert isinstance(role, str) PREFIX = 'samba.' assert role.startswith(PREFIX) id_ = role[len(PREFIX):] @@ -188,17 +185,17 @@ def task(ctx, config): yield finally: log.info('Stopping smbd processes...') - exc_info = (None, None, None) + exc = None for d in ctx.daemons.iter_daemons_of_role('smbd'): try: d.stop() except (run.CommandFailedError, run.CommandCrashedError, - run.ConnectionLostError): - exc_info = sys.exc_info() + run.ConnectionLostError) as e: + exc = e log.exception('Saw exception from %s.%s', d.role, d.id_) - if exc_info != (None, None, None): - six.reraise(exc_info[0], exc_info[1], exc_info[2]) + if exc is not None: + raise exc for id_, remote in samba_servers: remote.run( -- 2.39.5