From c0297b436a235f1f978f79dfec2dd8fde7a6aaa0 Mon Sep 17 00:00:00 2001 From: Sandon Van Ness Date: Mon, 25 Nov 2013 01:19:13 -0800 Subject: [PATCH] Changes suggested per review. Signed-off-by: Sandon Van Ness --- schedule_suite.sh | 2 +- teuthology/lock.py | 4 ++-- teuthology/misc.py | 2 +- teuthology/test/test_get_multi_machine_types.py | 5 ----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/schedule_suite.sh b/schedule_suite.sh index c71ec4f76f..fc6d12d8c3 100755 --- a/schedule_suite.sh +++ b/schedule_suite.sh @@ -37,7 +37,7 @@ fi stamp=`date +%Y-%m-%d_%H:%M:%S` nicesuite=`echo $suite | sed 's/\//:/g'` -name=`whoami`"-$stamp-$nicesuite-$ceph-$kernel-$flavor-$mtype" +name=`whoami`"-$stamp-$nicesuite-$ceph-$kernel-$flavor-$tube" function schedule_fail { SUBJECT="Failed to schedule $name" diff --git a/teuthology/lock.py b/teuthology/lock.py index 82ad433124..fc03429b1b 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -22,9 +22,9 @@ log = logging.getLogger(__name__) def lock_many(ctx, num, machinetype, user=None, description=None): machinetypes = misc.get_multi_machine_types(machinetype) + if user is None: + user = misc.get_user() for machinetype in machinetypes: - if user is None: - user = misc.get_user() success, content, status = ls.send_request( 'POST', config.lock_server, diff --git a/teuthology/misc.py b/teuthology/misc.py index 1183ec265b..8f7dbcce99 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -949,7 +949,7 @@ def get_multi_machine_types(machinetype): Converts machine type string to list based on common deliminators """ machinetypes = [] - machine_type_deliminator = ['-',' ',',','\t'] + machine_type_deliminator = [',',' ','\t'] for deliminator in machine_type_deliminator: if deliminator in machinetype: machinetypes = machinetype.split(deliminator) diff --git a/teuthology/test/test_get_multi_machine_types.py b/teuthology/test/test_get_multi_machine_types.py index 4cde05a626..c6013f436c 100644 --- a/teuthology/test/test_get_multi_machine_types.py +++ b/teuthology/test/test_get_multi_machine_types.py @@ -14,11 +14,6 @@ class TestGetMultiMachineTypes(object): expect = ['burnupi','plana','vps'] assert teuthology.get_multi_machine_types(give) == expect - def test_hiphen(self): - give = 'burnupi-plana-vps' - expect = ['burnupi','plana','vps'] - assert teuthology.get_multi_machine_types(give) == expect - def test_comma(self): give = 'burnupi,plana,vps' expect = ['burnupi','plana','vps'] -- 2.39.5