Changes suggested per review.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>

diff --git a/schedule_suite.sh b/schedule_suite.sh
index c71ec4f76fccb8cbfb2c32346d736fcf6a63657c..fc6d12d8c3d592a493b9967f2c608b6af2226b54 100755 (executable)
--- 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 82ad4331247cacd4c5cd79040b0b42d9b95bf4d4..fc03429b1b24895f94bfb922abfaad51bdec7720 100644 (file)
--- 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 1183ec265b764eb8a84f903d3a1b44fa1ff57b07..8f7dbcce99ad10599eabd5715b650487c6590f4a 100644 (file)
--- 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 4cde05a626f90ebd353425304087d2d52e5dd97d..c6013f436cfaf6e79afdf4696e2873a1d8aa83ef 100644 (file)
--- 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']