From: Ilya Dryomov Date: Tue, 28 Apr 2020 21:22:17 +0000 (+0200) Subject: qa/tasks/rbd: update NamedTemporaryFile usage for python3 X-Git-Tag: wip-pdonnell-testing-20200918.022351~1407^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=aba9910388cce7c03aa90726b5de1263298ac8ec;p=ceph-ci.git qa/tasks/rbd: update NamedTemporaryFile usage for python3 - open the file in text mode to avoid 'bytes' objects - 'bufsize' is now spelled 'buffering' and switching buffering off with 'buffering=0' is only allowed in binary mode. As we need the file to be either in the page cache or on disk before we copy it to the remote, call flush(). Signed-off-by: Ilya Dryomov --- diff --git a/qa/tasks/rbd.py b/qa/tasks/rbd.py index c690dcfe582..6d066a6f23c 100644 --- a/qa/tasks/rbd.py +++ b/qa/tasks/rbd.py @@ -413,9 +413,10 @@ def run_xfstests_one_client(ctx, role, properties): log.info(' randomize: {randomize}'.format(randomize=randomize)) if exclude_list: - with tempfile.NamedTemporaryFile(bufsize=0, prefix='exclude') as exclude_file: + with tempfile.NamedTemporaryFile(mode='w', prefix='exclude') as exclude_file: for test in exclude_list: exclude_file.write("{}\n".format(test)) + exclude_file.flush() remote.put_file(exclude_file.name, exclude_file.name) # Note that the device paths are interpreted using