[Piglit] [PATCH 2/2] framework: fix status order so that having dmesg is worse than not

[Ilia Mirkin]

It seems completely wrong to mark a test as "fixed" if you start
emitting dmesg spam in the middle of it. However it is a fix, of sorts,
to go from a dmesg-fail to a plain fail. Fix the result order to match
these expectations.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 framework/status.py             | 8 ++++----
 framework/tests/status_tests.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/framework/status.py b/framework/status.py
index aea3650..79d7c9e 100644
--- a/framework/status.py
+++ b/framework/status.py
@@ -213,12 +213,12 @@ SKIP = NoChangeStatus('skip')
 
 PASS = Status('pass', 0, (1, 1))
 
-DMESG_WARN = Status('dmesg-warn', 10)
+WARN = Status('warn', 10)
 
-WARN = Status('warn', 20)
+DMESG_WARN = Status('dmesg-warn', 20)
 
-DMESG_FAIL = Status('dmesg-fail', 30)
+FAIL = Status('fail', 30)
 
-FAIL = Status('fail', 40)
+DMESG_FAIL = Status('dmesg-fail', 40)
 
 CRASH = Status('crash', 50)
diff --git a/framework/tests/status_tests.py b/framework/tests/status_tests.py
index ec6bf18..c1d8c86 100644
--- a/framework/tests/status_tests.py
+++ b/framework/tests/status_tests.py
@@ -31,7 +31,7 @@ import framework.status as status
 
 # Statuses from worst to last. NotRun is intentionally not in this list and
 # tested separately because of upcoming features for it
-STATUSES = ["pass", "dmesg-warn", "warn", "dmesg-fail", "fail", "crash"]
+STATUSES = ["pass", "warn", "dmesg-warn", "fail", "dmesg-fail", "crash"]
 
 # all statuses except pass are problems
 PROBLEMS = STATUSES[1:]
-- 
1.8.3.2