workunit: fix default subdir

Make subdir argument optional.

diff --git a/teuthology/task/workunit.py b/teuthology/task/workunit.py
index e12650af2514fadb0c7e9722d3781cd8f2a5dee2..f0232d30847a3fbc4c887b84692da7320ebb482f 100644 (file)
--- a/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@ -129,7 +129,7 @@ def _spawn_on_all_clients(ctx, refspec, tests, env, subdir):
             for remote, role in client_remotes:
                 p.spawn(_run_tests, ctx, refspec, role, [unit], env, subdir)
 
-def _run_tests(ctx, refspec, role, tests, env, subdir):
+def _run_tests(ctx, refspec, role, tests, env, subdir=None):
     assert isinstance(role, basestring)
     PREFIX = 'client.'
     assert role.startswith(PREFIX)
@@ -137,10 +137,10 @@ def _run_tests(ctx, refspec, role, tests, env, subdir):
     (remote,) = ctx.cluster.only(role).remotes.iterkeys()
     mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
     # subdir so we can remove and recreate this a lot without sudo
-    if subdir:
-        scratch_tmp = os.path.join(mnt, subdir)
-    else:
+    if subdir is None:
         scratch_tmp = os.path.join(mnt, 'client.{id}'.format(id=id_), 'tmp')
+    else:
+        scratch_tmp = os.path.join(mnt, subdir)
     srcdir = '/tmp/cephtest/workunit.{role}'.format(role=role)
     secretfile = '/tmp/cephtest/data/{role}.secret'.format(role=role)
     teuthology.write_secret_file(remote, role, secretfile)