Merge lp:~chris.gagnon/helipad/graphics-sort-for-x-xmir-order into lp:helipad/graphics

[Chris Gagnon]

sort testnames so guitoolkits has the same order as openarena and nexuiz

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://s-jenkins:8080/job/helipad-graphics-ci/40/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/helipad-graphics-ci/40/rebuild

review: Approve (continuous-integration)

[Joe Talbott (joetalbott)]

Looks okay to me.

review: Approve

=== modified file 'api.py'
--- api.py	2013-09-23 19:08:33 +0000
+++ api.py	2013-10-02 13:45:33 +0000
@@ -65,6 +65,7 @@
             machine__name__contains=machine_filter,
             test_resolution=resolution_filter,
         ).distinct('name')]
+    test_names.sort()
 
     results = GraphicsMetric.objects.filter(
         name__contains=benchmark_filter,

=== modified file 'management/commands/jenkins_pull_phoronix.py'
--- management/commands/jenkins_pull_phoronix.py	2013-09-25 13:46:25 +0000
+++ management/commands/jenkins_pull_phoronix.py	2013-10-02 13:45:33 +0000
@@ -45,7 +45,7 @@
         jenk_build.jenkins_build.build_number for jenk_build in
         GraphicsMetric.objects.filter(
             jenkins_build__job__name__exact=jenkins_job_name)]
-    sorted(last_build, reverse=True)
+    sorted(last_build)
 
     # If there is no last build give it a value of 0
     if last_build == []:
@@ -54,7 +54,7 @@
     logger.debug('last build: {}'.format(last_build))
     url_list = jenkins_pull.url_artifact_list(jenkins_job_name,
                                               artifact_name,
-                                              last_build[0])
+                                              last_build[-1])
     logger.debug('url_list: {}'.format(url_list))
     if url_list is not False:
         for url_file in url_list:

=== modified file 'static/graphics/js/phoronix.js'
--- static/graphics/js/phoronix.js	2013-09-27 17:19:42 +0000
+++ static/graphics/js/phoronix.js	2013-10-02 13:45:33 +0000
@@ -90,12 +90,13 @@
         for (var key in data) {
             var key_name = data[key].key;
             if(key_name.indexOf('gui-toolkit') != -1){
-                // TODO somereason not filtering GtkDrawingArea fix it
                 key_name = key_name.replace(
                     / |gui-toolkit-|GtkPerf-|le-|-he|ps-/gi, '');
                 data[key].key = key_name;
-            }; // if key_name index
+            };
         }; // for key in data
+
+
         add_chart =  nv.addGraph(function() {
 
             var chart = nv.models.multiBarChart()