Merge lp:~pfalcon/linaro-android-frontend/lava-requests-fixes into lp:linaro-android-frontend

[Paul Sokolovsky]

This unbreaks LAVA result display and makes sure we immediately have better clue in case any similar issue arise in the future.

[James Tunnicliffe (dooferlad)]

Looks good.

[James Tunnicliffe (dooferlad)]

review: Approve

[Данило Шеган (danilo)]

Instead of using (typeof something == "undefined") you can use (something === undefined) (triple equality symbol). It's also interesting that you comment out the old-style URL attempts now: what happens with old builds that still have their artefacts on android-build?

[Данило Шеган (danilo)]

Actually, the above check for undefined won't work with variables directly, sorry.

[James Tunnicliffe (dooferlad)]

On 13 January 2012 16:43, Данило Шеган <email address hidden> wrote:
> Instead of using (typeof something == "undefined") you can use (something === undefined) (triple equality symbol).  It's also interesting that you comment out the old-style URL attempts now: what happens with old builds that still have their artefacts on android-build?

I was under the impression that we were dropping old builds, which was
why I OK'd the change!

--
James Tunnicliffe

=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py	2012-01-10 14:39:43 +0000
+++ android_build/frontend/api.py	2012-01-13 16:25:02 +0000
@@ -277,7 +277,9 @@
         response = urllib2.urlopen(url)
     except urllib2.HTTPError, e:
         message = "Server error: %d" % e.code
-        return HttpResponse(message)
+        resp = HttpResponse(message)
+        resp.status_code = e.code
+        return resp
     except urllib2.URLError, e:
         message = "We failed to reach a server."
 

=== modified file 'static/buildDetails.js'
--- static/buildDetails.js	2012-01-10 18:07:20 +0000
+++ static/buildDetails.js	2012-01-13 16:25:02 +0000
@@ -95,11 +95,6 @@
     }
 
     function receivedLavaJobInfo (e, response) {
-        if (response.response.match(/^Server error: 404$/))
-        {
-            return; // Nothing to parse
-        }
-
         if (typeof receivedLavaJobInfo.got_info != "undefined")
         {
             // Don't pass through a second job info. Assumption is that they are the same
@@ -112,13 +107,25 @@
         receivedLavaJobInfo.got_info = true;
 
         var job_info = Y.JSON.parse(response.responseText);
-        var job_info_json_url = job_info.lava_url + 'scheduler/job/' + job_info.job_id;
+        if (typeof job_info.lava_url == "undefined") {
+            Y.one("#testresults").setContent("This build did not undergo LAVA testing.");
+            return;
+        }
+        var job_info_json_url = job_info.lava_url;
+        if (job_info_json_url.substr(job_info_json_url.length - 1) != '/') {
+            job_info_json_url = job_info_json_url + '/';
+        }
+        job_info_json_url = job_info_json_url + 'scheduler/job/' + job_info.job_id;
+        Y.one("#testresults").append("<br/>Requesting LAVA job information...");
         Y.jsonp(
             job_info_json_url + '/json?callback={callback}', 
             {
                 args: [job_info_json_url],
                 on: {
-                    success: receivedJobJSON
+                    success: receivedJobJSON,
+                    failure: function (e) {
+                        Y.one("#testresults").append("<br/>Could not load LAVA job data: " + e.msg);
+                    }
                 }
             }
         );
@@ -179,15 +186,19 @@
               + rawBuildName + '/' + results.number.toString() + '/lava-job-info';
 
           // Try both locations. File should exist only in one location...
-          Y.io(
+/*          Y.io(
               old_style_url,
               {
                   on: { success: receivedLavaJobInfo }
-              });
+              });*/
           Y.io(
               new_style_url,
               {
-                  on: { success: receivedLavaJobInfo }
+                  on: { success: receivedLavaJobInfo,
+                        failure: function(id, resp) {
+                          Y.one('#testresults').append('<br/>Could not load lava-job-info: ' + resp.responseText);
+                        } 
+                  }
               });
 
           return 'Loading...';