From af89a4b33a32f8d7a5ddf35949e686e511e8b912 Mon Sep 17 00:00:00 2001
From: salimfadhley <sal@stodge.org>
Date: Wed, 12 Jun 2013 23:31:04 +0100
Subject: [PATCH] fix some stuff I broke

---
 jenkinsapi_tests/systests/__init__.py                  | 12 +++++++++++-
 jenkinsapi_tests/systests/test_parameterized_builds.py |  3 ---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/jenkinsapi_tests/systests/__init__.py b/jenkinsapi_tests/systests/__init__.py
index fb47609..52e4c9f 100644
--- a/jenkinsapi_tests/systests/__init__.py
+++ b/jenkinsapi_tests/systests/__init__.py
@@ -1,13 +1,17 @@
 import os
 import time
 import shutil
+import logging
 import tempfile
 import subprocess
 
+log = logging.getLogger(__name__)
 
 class Timeout(RuntimeError):
     pass
 
+class FailedToLaunch(RuntimeError):
+    pass
 
 class JenkinsLauncher(object):
 
@@ -27,6 +31,7 @@ class JenkinsLauncher(object):
         '''
         Launches jenkins and waits while it's ready.
         '''
+        log.info("Atempting to launch Jenkins...")
         self.jenkins_home = tempfile.mkdtemp(prefix='jenkins-home-')
         os.environ['JENKINS_HOME'] = self.jenkins_home
         jenkins_command = 'java -jar jenkins.war'
@@ -36,6 +41,11 @@ class JenkinsLauncher(object):
         start_time = time.time()
         while time.time() - start_time < self.timeout:
             line = self.jenkins_process.stderr.readline().strip()
+            log.info('Jenkins: %s' % line)
+
+            if 'Winstone shutdown successfully' in line:
+                raise FailedToLaunch()
+
             if line == 'INFO: Jenkins is fully up and running':
                 return
         raise Timeout('Timeout error occured while waiting for Jenkins start.')
@@ -55,4 +65,4 @@ def setUpPackage():
 
 
 def tearDownPackage():
-    launcher.stop()
\ No newline at end of file
+    launcher.stop()
diff --git a/jenkinsapi_tests/systests/test_parameterized_builds.py b/jenkinsapi_tests/systests/test_parameterized_builds.py
index 4009a09..48a0c2f 100644
--- a/jenkinsapi_tests/systests/test_parameterized_builds.py
+++ b/jenkinsapi_tests/systests/test_parameterized_builds.py
@@ -71,9 +71,6 @@ class TestParameterizedBuilds(BaseSystemTest):
         artifacts = b.get_artifact_dict()
         self.assertIsInstance(artifacts, dict)
 
-        import ipdb
-        ipdb.set_trace()
-
         artB = artifacts['b.txt']
 
         self.assertTrue(artB.get_data().strip(), param_B)
-- 
2.7.4