From 09bee435931931d23827aa86e97182e22fe0c0b8 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 1 Jul 2011 18:15:52 -0700 Subject: [PATCH] Move username to a utility method. --- teuthology/misc.py | 5 +++++ teuthology/run.py | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 974819dca42ee..d48b9d173760d 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -3,6 +3,8 @@ from cStringIO import StringIO import os import logging import configobj +import getpass +import socket import time import urllib2 import urlparse @@ -292,3 +294,6 @@ def get_clients(ctx, roles): id_ = role[len(PREFIX):] (remote,) = ctx.cluster.only(role).remotes.iterkeys() yield (id_, remote) + +def get_user(): + return getpass.getuser() + '@' + socket.gethostname() diff --git a/teuthology/run.py b/teuthology/run.py index 2c91ab373ca58..d96f71f1fee43 100644 --- a/teuthology/run.py +++ b/teuthology/run.py @@ -1,8 +1,6 @@ import argparse import os import yaml -import getpass -import socket def config_file(string): config = {} @@ -105,7 +103,8 @@ def main(): if ctx.owner is not None: ctx.summary['owner'] = ctx.owner else: - ctx.summary['owner'] = getpass.getuser() + '@' + socket.gethostname() + from teuthology.misc import get_user + ctx.summary['owner'] = get_user() if ctx.description is not None: ctx.summary['description'] = ctx.description -- 2.39.5