Merge lp:~cjohnston/qa-dashboard/fi-idle-test into lp:qa-dashboard

[Chris Johnston]

Fix idle power arch overview so that the no arch url test doesn't fail

Currently the no arch idle power arch overview test isn't playing nicely, and fails in some situations. This will make things play better.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:609
http://s-jenkins:8080/job/dashboard-ci/178/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dashboard-ci/178/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

review: Approve

=== modified file 'idle_power/tests.py'
--- idle_power/tests.py	2013-06-11 03:19:23 +0000
+++ idle_power/tests.py	2013-09-24 03:25:54 +0000
@@ -88,21 +88,9 @@
 
     def test_no_arch_overview(self):
         response = self.c.get(reverse('idle_power_arch', ))
-        rev_args = [self.image3861.arch, ]
-        redirect_url = reverse(
-            'idle_power_arch_overview',
-            args=rev_args,
-        )
-        self.assertEqual(response.status_code, 302)
-        self.assertRedirects(
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(
             response,
-            redirect_url,
-        )
-        redirect_response = self.c.get(redirect_url)
-        # Verify that the page redirects to an arch
-        self.assertEqual(redirect_response.status_code, 200)
-        self.assertTemplateUsed(
-            redirect_response,
             'idle_power/arch_overview.html',
         )
 

=== modified file 'idle_power/views.py'
--- idle_power/views.py	2013-05-21 16:00:12 +0000
+++ idle_power/views.py	2013-09-24 03:25:54 +0000
@@ -20,7 +20,6 @@
 from django.shortcuts import (
     render_to_response,
     get_object_or_404,
-    redirect,
 )
 
 from django_tables2 import RequestConfig
@@ -55,6 +54,7 @@
         'machine__id',
     ).distinct()
     arches = [x['image__arch'] for x in vals]
+    arches = sorted(arches)
     testcases = set(
         [x['testcase'] for x in vals if not arch or x['image__arch'] == arch]
     )
@@ -62,9 +62,10 @@
     chart_size = request.GET.get('size', '')
 
     if arch is None:
-        return redirect(
-            'arch/{}/'.format(arches[0] if len(arches) > 0 else "amd64")
-        )
+        if len(arches) > 0:
+            arch = arches[0]
+        else:
+            arch = "UNKNOWN"
 
     result = vals.filter(image__arch=arch).distinct('machine__name')