From 71a77f29089244d8cd0f008f9493b5a59130a559 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 20 Aug 2013 16:25:25 -0500 Subject: [PATCH] Add get_test_user(), because hardcoding is bad --- teuthology/misc.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index b74a2bb7d8acd..337d0115f8e0b 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -86,14 +86,23 @@ def get_testdir(ctx): user=get_user()[0:2], stamp=stamp) + +def get_test_user(ctx): + """ + :returns: str -- the user to run tests as on remote hosts + """ + return ctx.teuthology_config.get('test_user', 'ubuntu') + + def get_testdir_base(ctx): if 'test_path' in ctx.teuthology_config: return ctx.teuthology_config['test_path'] - owner_user = ctx.owner.split('@')[0] + test_user = get_test_user(ctx) # FIXME this ideally should use os.path.expanduser() in the future, in case # $HOME isn't /home/$USER - e.g. on a Mac. However, since we're executing # this on the server side, it won't work properly. - return ctx.teuthology_config.get('base_test_dir', '/home/%s/cephtest' % owner_user) + return ctx.teuthology_config.get('base_test_dir', '/home/%s/cephtest' % + test_user) def get_ceph_binary_url(package=None, branch=None, tag=None, sha1=None, dist=None, -- 2.39.5