From 7a059f9f2a9329ae8b4924e50860f8855cd3f2b8 Mon Sep 17 00:00:00 2001 From: salimfadhley Date: Sat, 15 Jun 2013 22:59:11 +0100 Subject: [PATCH] remove redundant imports from jenkins launcher --- jenkinsapi_utils/jenkins_launcher.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/jenkinsapi_utils/jenkins_launcher.py b/jenkinsapi_utils/jenkins_launcher.py index aab1fba..d271ed6 100644 --- a/jenkinsapi_utils/jenkins_launcher.py +++ b/jenkinsapi_utils/jenkins_launcher.py @@ -1,23 +1,24 @@ import os -import io import time import Queue import shutil import logging -import requests import tempfile import threading import subprocess log = logging.getLogger(__name__) -class FailedToStart(Exception): pass -class TimeOut(Exception): pass +class FailedToStart(Exception): + pass -class StreamThread(threading.Thread): + +class TimeOut(Exception): + pass +class StreamThread(threading.Thread): def __init__(self, name, q, stream, fn_log): threading.Thread.__init__(self) @@ -26,8 +27,6 @@ class StreamThread(threading.Thread): self.stream = stream self.fn_log = fn_log - - def run(self): log.info("Starting %s", self.name) @@ -40,11 +39,13 @@ class StreamThread(threading.Thread): break self.q.put((self.name, None)) + class JenkinsLancher(object): + """ Launch jenkins """ - JENKINS_WAR_URL="http://mirrors.jenkins-ci.org/war/latest/jenkins.war" + JENKINS_WAR_URL = "http://mirrors.jenkins-ci.org/war/latest/jenkins.war" def __init__(self, war_path): self.war_path = war_path @@ -107,14 +108,14 @@ class JenkinsLancher(object): log.warn('Stream %s has terminated', streamName) - if __name__ == '__main__': logging.basicConfig() logging.getLogger('').setLevel(logging.INFO) log.info("Hello!") - jl = JenkinsLancher('/home/sal/workspace/jenkinsapi/src/jenkinsapi_tests/systests/jenkins.war') + jl = JenkinsLancher( + '/home/sal/workspace/jenkinsapi/src/jenkinsapi_tests/systests/jenkins.war') jl.start() log.info("Jenkins was launched...") -- 2.7.4