From: Samuel Just <sjust@redhat.com>
Date: Thu, 7 May 2015 19:56:53 +0000 (-0700)
Subject: matrix: fix Concat.index -- should be (item, {concat_items})
X-Git-Tag: 1.1.0~947^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F486%2Fhead;p=teuthology.git

matrix: fix Concat.index -- should be (item, {concat_items})

Previously, it just returned {concat_items} which isn't right.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/teuthology/matrix.py b/teuthology/matrix.py
index 3f76cea19..63c61607d 100644
--- a/teuthology/matrix.py
+++ b/teuthology/matrix.py
@@ -164,7 +164,7 @@ class Concat(Matrix):
         for submat in self.submats:
             for i in range(submat.size()):
                 out = out | frozenset([submat.index(i)])
-        return out
+        return (self.item, out)
 
 class Sum(Matrix):
     """