From 33170c6f4675d40aa30a76dc51c13e581e9123d3 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 1 Dec 2016 11:30:49 -0800 Subject: [PATCH] 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 --- teuthology/suite/matrix.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 -- 2.47.3