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

[Allan LeSage]

Straightforwardly remove the prints.

[Chris Gagnon (chris.gagnon)]

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]

767. By Allan LeSage on 2014-04-21

Add imports to fix failing tests :/ .

[Allan LeSage (allanlesage)]

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

[Chris Gagnon (chris.gagnon)]

lgtm

review: Approve

=== 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 @@
 
 from gaps.util.jenkins_pull import (
     _get_artifact_urls,
-    build,
     JenkinsAPIException,
-    job,
     url_artifact_list,
 )
+from jenkinsapi import build, job
 from jenkinsapi.api import Jenkins
 
 
@@ -77,7 +76,7 @@
         self.jenkinsapi_job_mock = MagicMock(
             spec=job.Job)
         jenkinsapi_job_patch = patch(
-            'gaps.util.jenkins_pull.job.Job',
+            'jenkinsapi.job.Job',
             new=self.jenkinsapi_job_mock)
         jenkinsapi_job_patch.start()
         self.addCleanup(jenkinsapi_job_patch.stop)
@@ -85,7 +84,7 @@
         self.jenkinsapi_build_mock = MagicMock(
             spec=build.Build)
         jenkinsapi_build_patch = patch(
-            'gaps.util.jenkins_pull.job.Job',
+            'jenkinsapi.build.Build',
             new=self.jenkinsapi_build_mock)
         jenkinsapi_build_patch.start()
         self.addCleanup(jenkinsapi_build_patch.stop)

=== 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 @@
     CoverageData,
     CoverageProject,
     CoverageStack,
-    StackCoverageObservation
 )
 from gaps.util import extractor, jenkins_pull
 
@@ -22,7 +21,7 @@
     :param jenkins_job_name: job to get artifacts from
     :param file_name: file name of artifact
     """
-    print("getting last_build")
+    logger.debug("getting last_build")
     last_build = [
         j_build.coverage_build.build_number for j_build in
         CoverageData.objects.filter(
@@ -30,7 +29,7 @@
     sorted(last_build)
     if last_build == []:
         last_build.append(0)
-    print("last build in our database is {}".format(last_build[-1]))
+    logger.debug("last build in our database is {}".format(last_build[-1]))
     url_list = jenkins_pull.url_artifact_list(
         jenkins_job_name,
         file_name,
@@ -39,7 +38,7 @@
 
     if url_list:
         for build_info in url_list:
-            print('build info{}'.format(build_info))
+            logger.debug('build info{}'.format(build_info))
             if build_info['url'].endswith('xml'):
                 url_file = build_info['url']
                 url = '/'.join(build_info['url'].split('/')[:5])

=== 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 @@
 
+import logging
 import time
-from jenkinsapi import (
-    #api,
-    build,
-    job,
-)
+
 from jenkinsapi.api import Jenkins
 from jenkinsapi.custom_exceptions import JenkinsAPIException
 from qa_dashboard.settings import JENKINS_URL
 
+logger = logging.getLogger('qa_dashboard')
+
 
 def _get_artifact_urls(build, artifact_name):
     """Return artifact urls from build
@@ -47,7 +46,8 @@
     try:
         job = jenkapi.get_job(jenkins_job_name)
     except:
-        print("job with name {} does not exist".format(jenkins_job_name))
+        logger.debug(
+            "job with name {} does not exist".format(jenkins_job_name))
         return False
     try:
         build_ids = job.get_build_ids()
@@ -68,7 +68,7 @@
 
             if urls:
                 for url in urls:
-                    print("adding url {}".format(url))
+                    logger.debug("adding url {}".format(url))
                     url_list.append({
                         'url': ''.join(url),
                         'build_id': id,
@@ -80,7 +80,7 @@
                     'build_id': id,
                     'ran_at': ran_at
                 })
-    print url_list
+    logger.debug(url_list)
     if url_list:
         return url_list
     else: