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 f4d91a584848a4f3e0e79b56d3aa2995f4e97d7a..956425d6790d56a124892f9a0159a2011039650b 100644 (file)
--- 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