qa-coverage-dashboard

Merge lp:~allanlesage/qa-coverage-dashboard/logging-only into lp:qa-coverage-dashboard

  1. logging-only
  2. Merge into trunk
Proposed by Allan LeSage
Status: Merged
Approved by: Chris Gagnon
Approved revision: 767
Merged at revision: 767
Proposed branch: lp:~allanlesage/qa-coverage-dashboard/logging-only
Merge into: lp:qa-coverage-dashboard
Diff against target: 124 lines (+14/-16)
3 files modified
gaps/tests/test_jenkins_pull.py (+3/-4)
gaps/util/add.py (+3/-4)
gaps/util/jenkins_pull.py (+8/-8)
To merge this branch: bzr merge lp:~allanlesage/qa-coverage-dashboard/logging-only
Reviewer Review Type Date Requested Status
Chris Gagnon (community) Approve
Review via email: mp+216496@code.launchpad.net

Description of the change

Straightforwardly remove the prints.

To post a comment you must log in.
Revision history for this message
Chris Gagnon (chris.gagnon) wrote :

I don't think you meant to delete this

47 -from jenkinsapi import (
48 - #api,
49 - build,
50 - job,
51 -)

review: Needs Fixing
lp:~allanlesage/qa-coverage-dashboard/logging-only updated
767. By Allan LeSage

Add imports to fix failing tests :/ .

Revision history for this message
Allan LeSage (allanlesage) wrote :

Deleted the above to satisfy flake8, corrected with proper import in test instead.

Revision history for this message
Chris Gagnon (chris.gagnon) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'gaps/tests/test_jenkins_pull.py'
--- gaps/tests/test_jenkins_pull.py 2014-04-09 18:53:36 +0000
+++ gaps/tests/test_jenkins_pull.py 2014-04-21 00:36:52 +0000
@@ -6,11 +6,10 @@
66
7from gaps.util.jenkins_pull import (7from gaps.util.jenkins_pull import (
8 _get_artifact_urls,8 _get_artifact_urls,
9 build,
10 JenkinsAPIException,9 JenkinsAPIException,
11 job,
12 url_artifact_list,10 url_artifact_list,
13)11)
12from jenkinsapi import build, job
14from jenkinsapi.api import Jenkins13from jenkinsapi.api import Jenkins
1514
1615
@@ -77,7 +76,7 @@
77 self.jenkinsapi_job_mock = MagicMock(76 self.jenkinsapi_job_mock = MagicMock(
78 spec=job.Job)77 spec=job.Job)
79 jenkinsapi_job_patch = patch(78 jenkinsapi_job_patch = patch(
80 'gaps.util.jenkins_pull.job.Job',79 'jenkinsapi.job.Job',
81 new=self.jenkinsapi_job_mock)80 new=self.jenkinsapi_job_mock)
82 jenkinsapi_job_patch.start()81 jenkinsapi_job_patch.start()
83 self.addCleanup(jenkinsapi_job_patch.stop)82 self.addCleanup(jenkinsapi_job_patch.stop)
@@ -85,7 +84,7 @@
85 self.jenkinsapi_build_mock = MagicMock(84 self.jenkinsapi_build_mock = MagicMock(
86 spec=build.Build)85 spec=build.Build)
87 jenkinsapi_build_patch = patch(86 jenkinsapi_build_patch = patch(
88 'gaps.util.jenkins_pull.job.Job',87 'jenkinsapi.build.Build',
89 new=self.jenkinsapi_build_mock)88 new=self.jenkinsapi_build_mock)
90 jenkinsapi_build_patch.start()89 jenkinsapi_build_patch.start()
91 self.addCleanup(jenkinsapi_build_patch.stop)90 self.addCleanup(jenkinsapi_build_patch.stop)
9291
=== modified file 'gaps/util/add.py'
--- gaps/util/add.py 2014-03-20 21:19:09 +0000
+++ gaps/util/add.py 2014-04-21 00:36:52 +0000
@@ -7,7 +7,6 @@
7 CoverageData,7 CoverageData,
8 CoverageProject,8 CoverageProject,
9 CoverageStack,9 CoverageStack,
10 StackCoverageObservation
11)10)
12from gaps.util import extractor, jenkins_pull11from gaps.util import extractor, jenkins_pull
1312
@@ -22,7 +21,7 @@
22 :param jenkins_job_name: job to get artifacts from21 :param jenkins_job_name: job to get artifacts from
23 :param file_name: file name of artifact22 :param file_name: file name of artifact
24 """23 """
25 print("getting last_build")24 logger.debug("getting last_build")
26 last_build = [25 last_build = [
27 j_build.coverage_build.build_number for j_build in26 j_build.coverage_build.build_number for j_build in
28 CoverageData.objects.filter(27 CoverageData.objects.filter(
@@ -30,7 +29,7 @@
30 sorted(last_build)29 sorted(last_build)
31 if last_build == []:30 if last_build == []:
32 last_build.append(0)31 last_build.append(0)
33 print("last build in our database is {}".format(last_build[-1]))32 logger.debug("last build in our database is {}".format(last_build[-1]))
34 url_list = jenkins_pull.url_artifact_list(33 url_list = jenkins_pull.url_artifact_list(
35 jenkins_job_name,34 jenkins_job_name,
36 file_name,35 file_name,
@@ -39,7 +38,7 @@
3938
40 if url_list:39 if url_list:
41 for build_info in url_list:40 for build_info in url_list:
42 print('build info{}'.format(build_info))41 logger.debug('build info{}'.format(build_info))
43 if build_info['url'].endswith('xml'):42 if build_info['url'].endswith('xml'):
44 url_file = build_info['url']43 url_file = build_info['url']
45 url = '/'.join(build_info['url'].split('/')[:5])44 url = '/'.join(build_info['url'].split('/')[:5])
4645
=== modified file 'gaps/util/jenkins_pull.py'
--- gaps/util/jenkins_pull.py 2014-04-08 05:11:35 +0000
+++ gaps/util/jenkins_pull.py 2014-04-21 00:36:52 +0000
@@ -1,14 +1,13 @@
11
2import logging
2import time3import time
3from jenkinsapi import (4
4 #api,
5 build,
6 job,
7)
8from jenkinsapi.api import Jenkins5from jenkinsapi.api import Jenkins
9from jenkinsapi.custom_exceptions import JenkinsAPIException6from jenkinsapi.custom_exceptions import JenkinsAPIException
10from qa_dashboard.settings import JENKINS_URL7from qa_dashboard.settings import JENKINS_URL
118
9logger = logging.getLogger('qa_dashboard')
10
1211
13def _get_artifact_urls(build, artifact_name):12def _get_artifact_urls(build, artifact_name):
14 """Return artifact urls from build13 """Return artifact urls from build
@@ -47,7 +46,8 @@
47 try:46 try:
48 job = jenkapi.get_job(jenkins_job_name)47 job = jenkapi.get_job(jenkins_job_name)
49 except:48 except:
50 print("job with name {} does not exist".format(jenkins_job_name))49 logger.debug(
50 "job with name {} does not exist".format(jenkins_job_name))
51 return False51 return False
52 try:52 try:
53 build_ids = job.get_build_ids()53 build_ids = job.get_build_ids()
@@ -68,7 +68,7 @@
6868
69 if urls:69 if urls:
70 for url in urls:70 for url in urls:
71 print("adding url {}".format(url))71 logger.debug("adding url {}".format(url))
72 url_list.append({72 url_list.append({
73 'url': ''.join(url),73 'url': ''.join(url),
74 'build_id': id,74 'build_id': id,
@@ -80,7 +80,7 @@
80 'build_id': id,80 'build_id': id,
81 'ran_at': ran_at81 'ran_at': ran_at
82 })82 })
83 print url_list83 logger.debug(url_list)
84 if url_list:84 if url_list:
85 return url_list85 return url_list
86 else:86 else:

Subscribers

People subscribed via source and target branches

to all changes: