From: Sage Weil <sage@inktank.com>
Date: Fri, 7 Mar 2014 01:55:00 +0000 (-0800)
Subject: suite: fix build_matrix for + case
X-Git-Tag: 1.1.0~1624^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94d73bd4113441f84c2dd76c708c6bda569864ad;p=teuthology.git

suite: fix build_matrix for + case

The + means we should concatenate everything in the directory.  Do that.

This was totally broken before (and unused until now).

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 60d09e7a2..0ff0c50d3 100644
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -160,13 +160,14 @@ def build_matrix(path):
         if '+' in files:
             # concatenate items
             files.remove('+')
-            out = []
+            raw = []
             for fn in files:
-                out.extend(build_matrix(os.path.join(path, fn)))
-            return [(
-                    '+',
-                    [a[1] for a in out]
-                    )]
+                raw.extend(build_matrix(os.path.join(path, fn)))
+            out = [(
+                '{' + ' '.join(files) + '}',
+                [a[1][0] for a in raw]
+            )]
+            return out
         elif '%' in files:
             # convolve items
             files.remove('%')