From 7a6ccda6074f8f5b7449b50bc29ddaae38fbe329 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Fri, 19 Jun 2015 15:40:12 -0400
Subject: [PATCH] Fix intermittent test failures because of sort order

Both py27 and py34 jobs fail intermittently and i can
recreate the problem even in my local environment by
repeatedly running "tox -e py27,py34". Fixing up the
sort order helps fix the this issue.

Change-Id: I680c8e986af9177c759740ecb8b94b288386c1bf
---
 oslo_reports/views/json/generic.py | 2 +-
 oslo_reports/views/text/generic.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/oslo_reports/views/json/generic.py b/oslo_reports/views/json/generic.py
index b8911c1..5580ba1 100644
--- a/oslo_reports/views/json/generic.py
+++ b/oslo_reports/views/json/generic.py
@@ -38,7 +38,7 @@ class BasicKeyValueView(object):
     """
 
     def __call__(self, model):
-        res = utils.StringWithAttrs(json.dumps(model.data))
+        res = utils.StringWithAttrs(json.dumps(model.data, sort_keys=True))
         res.__is_json__ = True
         return res
 
diff --git a/oslo_reports/views/text/generic.py b/oslo_reports/views/text/generic.py
index 04bc027..5240a87 100644
--- a/oslo_reports/views/text/generic.py
+++ b/oslo_reports/views/text/generic.py
@@ -35,7 +35,7 @@ class MultiView(object):
     """
 
     def __call__(self, model):
-        res = [six.text_type(model[key]) for key in model]
+        res = sorted([six.text_type(model[key]) for key in model])
         return "\n".join(res)
 
 
@@ -49,7 +49,7 @@ class BasicKeyValueView(object):
 
     def __call__(self, model):
         res = ""
-        for key in model:
+        for key in sorted(model):
             res += "{key} = {value}\n".format(key=key, value=model[key])
 
         return res