Merge lp:~mrazik/jenkins-launchpad-plugin/lp1154185 into lp:~private-ps-quality-team/jenkins-launchpad-plugin/trunk

[Martin Mrazik]

In case the build result is STABLE or SUCCESS provide a link directly to the build instead of console output. The build main page has the summary of failed tests which is what you are interested in, in these two cases.
If the build result is FAILURE then keep the current functionality and link to console output as it is most likely a build error (merge error, etc).

In case the build result is STABLE or SUCCESS provide a link directly to the build instead of console output. The build main page has the summary of failed tests which is what you are interested in, in these two cases.
If the build result is FAILURE then keep the current functionality and link to console output as it is most likely a build error (merge error, etc).

[Michael Zanetti (mzanetti)]

looks good. just noticed a small inconsistency with chopping the trailing /. Its removed on console links, but not on the others..

[lp:~mrazik/jenkins-launchpad-plugin/lp1154185]

95. By Martin Mrazik on 2013-03-20

fixed IP addresses in the test to resemble real ones and striped a trailing "/" in urls

96. By Martin Mrazik on 2013-03-20

fixed a comment

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://s-jenkins:8080/job/jenkins-launchpad-plugin-ci/243/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/jenkins-launchpad-plugin-ci/./distribution=quantal,flavor=amd64/243/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/jenkins-launchpad-plugin-ci/243/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Approve.

review: Approve

=== modified file 'launchpad.py'
--- launchpad.py	2013-03-13 14:39:28 +0000
+++ launchpad.py	2013-03-20 14:06:21 +0000
@@ -353,15 +353,25 @@
                                  vote='Disapprove', subject=message,
                                  content=message)
 
+    def _get_result_line(self, result, url):
+        url = url.rstrip('/')
+        if result == 'SUCCESS' or result == 'UNSTABLE':
+            if url.endswith('console'):
+                # strip "/console"
+                url = url[:-8]
+        return "\n    {result}: {output}".format(
+            result=result,
+            output=url)
+
     def get_executed_test_runs_message(self, url):
         ret = "\nExecuted test runs:"
         jenkins = self._get_json_jenkins(url)
         builds = jenkinsutils.get_executed_builds(jenkins, url)
         coverity_artifacts = []
         for build in builds:
-            ret += "\n    {result}: {output}".format(
-                result=build['result'],
-                output=jenkinsutils.hide_jenkins_url(build['output']))
+            ret += self._get_result_line(
+                build['result'],
+                jenkinsutils.hide_jenkins_url(build['output']))
             if build['output'].endswith('console'):
                 build_url = build['output'][:-len('console')]
                 artifacts = jenkinsutils.get_coverity_artifacts(jenkins,

=== modified file 'tests/test_launchpadTrigger.py'
--- tests/test_launchpadTrigger.py	2013-03-13 15:08:30 +0000
+++ tests/test_launchpadTrigger.py	2013-03-20 14:06:21 +0000
@@ -441,6 +441,37 @@
             self.launchpadTrigger = launchpad.LaunchpadTrigger()
 
 
+class TestGetResultLine(TestWithScenarios, TestLaunchpadTrigger):
+    scenarios = [
+        ('success',
+         {'result': 'SUCCESS',
+          'url': 'http://10.0.0.1:8080/job/my-job/13/console',
+          'expected': "\n    SUCCESS: http://10.0.0.1:8080/job/my-job/13"}),
+        ('success_with_slash',
+         {'result': 'SUCCESS',
+          'url': 'http://10.0.0.1:8080/job/my-job/13/console/',
+          'expected': "\n    SUCCESS: http://10.0.0.1:8080/job/my-job/13"}),
+        ('unstable',
+         {'result': 'UNSTABLE',
+          'url': 'http://10.0.0.1:8080/job/my-job/13/console',
+          'expected': "\n    UNSTABLE: http://10.0.0.1:8080/job/my-job/13"}),
+        ('failed',
+         {'result': 'FAILURE',
+          'url': 'http://10.0.0.1:8080/job/my-job/13/console',
+          'expected':
+          "\n    FAILURE: http://10.0.0.1:8080/job/my-job/13/console"}),
+        ('none',
+         {'result': None,
+          'url': 'http://10.0.0.1:8080/job/my-job/13/console',
+          'expected':
+          "\n    None: http://10.0.0.1:8080/job/my-job/13/console"}),
+    ]
+
+    def test_get_result_line(self):
+        result = self.launchpadTrigger._get_result_line(self.result, self.url)
+        self.assertEqual(result, self.expected)
+
+
 class TestGetCommitMessage(TestWithScenarios, TestLaunchpadTrigger):
     scenarios = [
         ('no_commit_message',
@@ -701,10 +732,10 @@
         """distribution=raring,flavor=amd64/3/console
          FAILURE: http://jenkins:8080/job/job-multiconfig/./""" +
         """distribution=raring,flavor=i386/3/console
-         SUCCESS: http://jenkins:8080/job/job-freestyle/7/console
+         SUCCESS: http://jenkins:8080/job/job-freestyle/7
              deb: http://jenkins:8080/job/job-freestyle/7/artifact/work/""" +
         """output/*zip*/output.zip
-         UNSTABLE: http://jenkins:8080/job/freestyle-downstream/12/console
+         UNSTABLE: http://jenkins:8080/job/freestyle-downstream/12
      Coverity artifacts:
          http://jenkins:8080/job/job-multiconfig/./distribution=""" +
         """raring,flavor=amd64/3/artifact/results/coverity/CID_10895.html