]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
task/cephfs: use dedent for embedded python
authorJohn Spray <jspray@redhat.com>
Mon, 14 Jul 2014 12:02:58 +0000 (13:02 +0100)
committerJohn Spray <jspray@redhat.com>
Tue, 15 Jul 2014 12:30:16 +0000 (13:30 +0100)
Signed-off-by: John Spray <john.spray@redhat.com>
teuthology/task/cephfs/mount.py

index 6a02a0ab205b25b1642fe2431de3a957a49a2955..bb8a6caa14805d1dd25fc3b1adb91c913d909451 100644 (file)
@@ -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)