some small fixes

diff --git a/jenkinsapi_tests/systests/test_jenkins.py b/jenkinsapi_tests/systests/test_jenkins.py
index 3c32e77b76e0eded375b2a046f8515aaf37fa9cb..af7be3b1eb1d7602d03861abefebcc37510b3361 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins.py
+++ b/jenkinsapi_tests/systests/test_jenkins.py
@@ -3,20 +3,22 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import unittest
 from jenkinsapi.invocation import Invocation
+from jenkinsapi_tests.systests.base import BaseSystemTest
+from jenkinsapi_tests.systests.job_configs import EMPTY_JOB
 from jenkinsapi_tests.test_utils.random_strings import random_string
-from jenkinsapi_tests.systests.base import BaseSystemTest, EMPTY_JOB_CONFIG
+
 
 
 class JobTests(BaseSystemTest):
 
     def test_create_job(self):
         job_name = 'create_%s' % random_string()
-        self.jenkins.create_job(job_name, EMPTY_JOB_CONFIG)
+        self.jenkins.create_job(job_name, EMPTY_JOB)
         self.assertJobIsPresent(job_name)
 
     def test_enable_disable_job(self):
         job_name = 'create_%s' % random_string()
-        self.jenkins.create_job(job_name, EMPTY_JOB_CONFIG)
+        self.jenkins.create_job(job_name, EMPTY_JOB)
         self.assertJobIsPresent(job_name)
 
         j = self.jenkins[job_name]
@@ -29,20 +31,20 @@ class JobTests(BaseSystemTest):
 
     def test_get_job_and_update_config(self):
         job_name = 'config_%s' % random_string()
-        self.jenkins.create_job(job_name, EMPTY_JOB_CONFIG)
+        self.jenkins.create_job(job_name, EMPTY_JOB)
         self.assertJobIsPresent(job_name)
         config = self.jenkins[job_name].get_config()
-        self.assertEquals(config.strip(), EMPTY_JOB_CONFIG.strip())
-        self.jenkins[job_name].update_config(EMPTY_JOB_CONFIG)
+        self.assertEquals(config.strip(), EMPTY_JOB.strip())
+        self.jenkins[job_name].update_config(EMPTY_JOB)
 
     def test_invoke_job(self):
         job_name = 'create_%s' % random_string()
-        job = self.jenkins.create_job(job_name, EMPTY_JOB_CONFIG)
+        job = self.jenkins.create_job(job_name, EMPTY_JOB)
         job.invoke()
 
     def test_invocation_object(self):
         job_name = 'create_%s' % random_string()
-        job = self.jenkins.create_job(job_name, EMPTY_JOB_CONFIG)
+        job = self.jenkins.create_job(job_name, EMPTY_JOB)
         ii = job.invoke()
         self.assertIsInstance(ii, Invocation)
 

diff --git a/jenkinsapi_tests/systests/test_queue.py b/jenkinsapi_tests/systests/test_queue.py
index 8bf0e7f6efabcb13a9a6656ab6bdae17ecf65d7f..e325cc4a8bf187ffa92e6bfd55d6409fa151aca7 100644 (file)
--- a/jenkinsapi_tests/systests/test_queue.py
+++ b/jenkinsapi_tests/systests/test_queue.py
@@ -15,6 +15,7 @@ class TestQueue(BaseSystemTest):
     """
     All kinds of testing on Jenkins Queues
     """
+    #TODO: Test timeout behavior
 
     def test_get_queue(self):
         qq = self.jenkins.get_queue()

diff --git a/jenkinsapi_tests/unittests/test_jenkins.py b/jenkinsapi_tests/unittests/test_jenkins.py
index 07193f38e80856b3ce69c3335ba2b0b01a47e84f..29df9ea63e6365621e68ddc5589feb104cfeb2e8 100644 (file)
--- a/jenkinsapi_tests/unittests/test_jenkins.py
+++ b/jenkinsapi_tests/unittests/test_jenkins.py
@@ -1,9 +1,10 @@
 import mock
 import unittest
 
-from jenkinsapi.jenkins import Jenkins, JenkinsBase, Job
 from jenkinsapi.utils.requester import Requester
 from jenkinsapi.exceptions import JenkinsAPIException
+from jenkinsapi.jenkins import Jenkins, JenkinsBase, Job
+
 
 class TestJenkins(unittest.TestCase):