Merge lp:~stevanr/linaro-ci-dashboard/fix_jenkins_dashboard_lib into lp:linaro-ci-dashboard

[Stevan Radaković]

Fix exception handling for jenkins lib extension.

[Paul Sokolovsky (pfalcon)]

I would really suggest to use log.exception() in exception handlers - let's see what actual underlying error. Later, when we go into production mode, we can replace those which appear to frequently and don't represent real error with .info()/.warning() . But for time being ability to see real error which happens is a must imho.

[lp:~stevanr/linaro-ci-dashboard/fix_jenkins_dashboard_lib]

59. By Stevan Radaković on 2012-09-18

Add exception log. Fix some more errors in extended jenkins lib.

[Paul Sokolovsky (pfalcon)]

Approved, thanks.

review: Approve

[lp:~stevanr/linaro-ci-dashboard/fix_jenkins_dashboard_lib]

60. By Stevan Radaković on 2012-09-18

Fix tests.

=== modified file 'dashboard/jenkinsserver/models/jenkins_server.py'
--- dashboard/jenkinsserver/models/jenkins_server.py	2012-09-17 13:15:47 +0000
+++ dashboard/jenkinsserver/models/jenkins_server.py	2012-09-18 16:03:19 +0000
@@ -71,7 +71,7 @@
                         # update the build info in CI.
                         if build.remote_number and \
                             jenkins_build["number"] == build.remote_number:
-                            self.get_build_info()
+                            self.get_build_info(build)
 
     def get_build_info(self, build):
         jenkins_build = self.jenkins.get_build_info(build.loop.name,
@@ -90,7 +90,13 @@
         builds = LoopBuild.objects.filter(
             status__in=LoopBuild.NON_FINISHED_STATUSES)
         for build in builds:
-            self.get_build_info(build)
+            # We don't wont the sync proces to fail if there is no particular
+            # loop present in jenkins. Log the error and continue.
+            try:
+                self.get_build_info(build)
+            except:
+                self.log.exception("build[%s] does not exist for job %s" % (build.remote_number, build.loop.name))
+                pass
 
     def create_job(self, jname, jxml):
         """ Creates a new job on jenkins if its  not already present """

=== modified file 'dashboard/jenkinsserver/tests/test_jenkins_server.py'
--- dashboard/jenkinsserver/tests/test_jenkins_server.py	2012-08-22 14:44:49 +0000
+++ dashboard/jenkinsserver/tests/test_jenkins_server.py	2012-09-18 16:03:19 +0000
@@ -99,5 +99,22 @@
         integration_loop.command = 'make test'
         integration_loop.save()
         build_number = self.server.schedule_job_build("test-loop")
-        self.assertIs(build_number, 1)
+        self.assertIsNotNone(build_number)
         self.server.delete_job("test-loop")
+
+    def test_sync_unfinished_builds_no_build_present(self):
+        integration_loop = IntegrationLoop()
+        integration_loop.name = self.test_job_name
+        integration_loop.server = self.server
+        integration_loop.branch = 'lp:linaro-ci-dashboard'
+        integration_loop.precommand = 'make migrate'
+        integration_loop.command = 'make test'
+        integration_loop.save()
+        # schedule a few builds
+        integration_loop.schedule_build()
+        integration_loop.schedule_build()
+        self.server.sync_unfinished_builds()
+        for build in integration_loop.loopbuild_set.all():
+            self.assertIsNotNone(build.duration)
+            self.assertIsNot(build.duration, 0.0)
+        self.server.delete_job(self.test_job_name)

=== modified file 'dashboard/lib/jenkins_dashboard.py'
--- dashboard/lib/jenkins_dashboard.py	2012-09-11 15:50:11 +0000
+++ dashboard/lib/jenkins_dashboard.py	2012-09-18 16:03:19 +0000
@@ -35,11 +35,11 @@
             if response:
                 return json.loads(response)
             else:
-                raise JenkinsException('job[%s] does not exist' % name)
+                raise jenkins.JenkinsException('build[%s] does not exist for job %s' % (build_number, name))
         except urllib2.HTTPError:
-            raise JenkinsException('job[%s] does not exist' % name)
+            raise jenkins.JenkinsException('build[%s] does not exist for job %s' % (build_number, name))
         except ValueError:
-            raise JenkinsException(
+            raise jenkins.JenkinsException(
                 "Could not parse JSON info for job[%s]" % name)
 
     def get_build_output(self, name, build_number):
@@ -50,9 +50,9 @@
             if response:
                 return response
             else:
-                raise JenkinsException('job[%s] does not exist' % name)
+                raise jenkins.JenkinsException('build[%s] does not exist for job %s' % (build_number, name))
         except urllib2.HTTPError:
-            raise JenkinsException('job[%s] does not exist' % name)
+            raise jenkins.JenkinsException('build[%s] does not exist for job %s' % (build_number, name))
         except ValueError:
-            raise JenkinsException(
+            raise jenkins.JenkinsException(
                 "Could not parse JSON info for job[%s]" % name)