From 403ba2c892500d3d4a21b1c7d3ee476b31ba0dbd Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 14 Jul 2014 13:02:58 +0100 Subject: [PATCH] task/cephfs: use dedent for embedded python Signed-off-by: John Spray --- teuthology/task/cephfs/mount.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/teuthology/task/cephfs/mount.py b/teuthology/task/cephfs/mount.py index 6a02a0ab205..bb8a6caa148 100644 --- a/teuthology/task/cephfs/mount.py +++ b/teuthology/task/cephfs/mount.py @@ -1,6 +1,7 @@ import logging import datetime +from textwrap import dedent import os from teuthology.orchestra import run from teuthology.orchestra.run import CommandFailedError @@ -93,16 +94,16 @@ class CephFSMount(object): path = os.path.join(self.mountpoint, basename) - pyscript = """ -import time + pyscript = dedent(""" + import time -f = open("{path}", 'w') -f.write('content') -f.flush() -f.write('content2') -while True: - time.sleep(1) -""".format(path=path) + f = open("{path}", 'w') + f.write('content') + f.flush() + f.write('content2') + while True: + time.sleep(1) + """).format(path=path) rproc = self._run_python(pyscript) self.background_procs.append(rproc) @@ -118,13 +119,13 @@ while True: path = os.path.join(self.mountpoint, basename) - pyscript = """ -import time + pyscript = dedent(""" + import time -f = open("{path}", 'w') -f.write('content') -f.close() -""".format(path=path) + f = open("{path}", 'w') + f.write('content') + f.close() + """).format(path=path) rproc = self._run_python(pyscript) self.background_procs.append(rproc)