From: Samuel Just <sjust@redhat.com>
Date: Thu, 1 Dec 2016 19:30:49 +0000 (-0800)
Subject: matrix.py: actually generate sorted descriptons
X-Git-Tag: 1.1.0~494^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F991%2Fhead;p=teuthology.git

matrix.py: actually generate sorted descriptons

The existing code compares strings and tuples which, based on what seems
to be happening, is at best counterintuitive and at worst
non-deterministic.

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

diff --git a/teuthology/suite/matrix.py b/teuthology/suite/matrix.py
index f4d91a584..956425d67 100644
--- a/teuthology/suite/matrix.py
+++ b/teuthology/suite/matrix.py
@@ -318,9 +318,7 @@ def generate_desc(joinf, result):
     Generates the text description of the test represented by result
     """
     if type(result) is frozenset:
-        ret = []
-        for i in sorted(result):
-            ret.append(generate_desc(joinf, i))
+        ret = sorted([generate_desc(joinf, i) for i in result])
         return '{' + ' '.join(ret) + '}'
     elif type(result) is tuple:
         (item, children) = result