Tiny fixes.

diff --git a/jenkinsapi/job.py b/jenkinsapi/job.py
index eada1fc5f434faca6c380df3c148c621c1ffd76c..a0c1e0681259962cfc8b79027c3621dced8166e8 100644 (file)
--- a/jenkinsapi/job.py
+++ b/jenkinsapi/job.py
@@ -2,21 +2,8 @@
 Module for jenkinsapi Job
 """
 
-import json
-import logging
-
-try:
-    import urlparse
-except ImportError:
-    # Python3
-    import urllib.parse as urlparse
-
-import xml.etree.ElementTree as ET
 from collections import defaultdict
 from jenkinsapi.build import Build
-from jenkinsapi.queue import QueueItem
-from jenkinsapi.jenkinsbase import JenkinsBase
-from jenkinsapi.mutable_jenkins_thing import MutableJenkinsThing
 from jenkinsapi.custom_exceptions import (
     NoBuildData,
     NotConfiguredSCM,
@@ -26,6 +13,21 @@ from jenkinsapi.custom_exceptions import (
     UnknownQueueItem,
     BadParams,
 )
+from jenkinsapi.jenkinsbase import JenkinsBase
+from jenkinsapi.mutable_jenkins_thing import MutableJenkinsThing
+from jenkinsapi.queue import QueueItem
+import json
+import logging
+
+import xml.etree.ElementTree as ET
+
+
+try:
+    import urlparse
+except ImportError:
+    # Python3
+    import urllib.parse as urlparse
+
 
 SVN_URL = './scm/locations/hudson.scm.SubversionSCM_-ModuleLocation/remote'
 GIT_URL = './scm/userRemoteConfigs/hudson.plugins.git.UserRemoteConfig/url'

diff --git a/jenkinsapi_tests/unittests/test_job.py b/jenkinsapi_tests/unittests/test_job.py
index ab0a41100bde046fc71841f5c155e9433595f9cb..aaa29d4b4bb89b147f60afce91a21b8471455e4c 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job.py
+++ b/jenkinsapi_tests/unittests/test_job.py
@@ -122,7 +122,7 @@ class TestJob(unittest.TestCase):
         self.assertEquals(self.j.get_description(), 'test job')
 
     def test_get_build_triggerurl(self):
-        self.assertEquals(self.j.get_build_triggerurl(),
+        self.assertEquals(self.j.get_build_triggerurl(None),
                           'http://halob:8080/job/foo/buildWithParameters')
 
     def test_wrong__mk_json_from_build_parameters(self):