updating and fixing tests

diff --git a/jenkinsapi_tests/unittests/test_job.py b/jenkinsapi_tests/unittests/test_job.py
index 8f8434c8240db30efd269664883801901632149b..8fc9dbfece102f923c62f7e64935ccb77c74a245 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job.py
+++ b/jenkinsapi_tests/unittests/test_job.py
@@ -1,6 +1,7 @@
 import mock
 import unittest
 
+from jenkinsapi import config
 from jenkinsapi.job import Job
 from jenkinsapi.jenkinsbase import JenkinsBase
 from jenkinsapi.exceptions import NoBuildData
@@ -38,7 +39,7 @@ class TestJob(unittest.TestCase):
             "scm": {},
             "upstreamProjects": []}
 
-    URL_DATA = {'http://halob:8080/job/foo/api/python/':JOB_DATA}
+    URL_DATA = {'http://halob:8080/job/foo/%s' % config.JENKINS_API:JOB_DATA}
 
     def fakeGetData(self, url, *args):
         try:

diff --git a/jenkinsapi_tests/unittests/test_queue.py b/jenkinsapi_tests/unittests/test_queue.py
index aebd4b926e53a7995d0be3a5ebc4af41eb2e242c..aa048b30a87389317bccc851d7dd2015acadbd78 100644 (file)
--- a/jenkinsapi_tests/unittests/test_queue.py
+++ b/jenkinsapi_tests/unittests/test_queue.py
@@ -2,6 +2,7 @@ import mock
 import unittest
 
 from collections import defaultdict
+from jenkinsapi import config
 from jenkinsapi.jenkins import Jenkins
 from jenkinsapi.queue import Queue, QueueItem
 from jenkinsapi.jenkinsbase import JenkinsBase
@@ -23,18 +24,18 @@ class TestQueue(unittest.TestCase):
 
     URL_DATA = {}
 
-    URL_DATA['http://localhost:8080/api/python/'] = \
+    URL_DATA['http://localhost:8080/%s' % config.JENKINS_API] = \
         {'jobs':[
             {'name':'utmebvpxrw', 
               'url':'http://localhost/job/utmebvpxrw'}
               ]
         }
 
-    URL_DATA['http://localhost/job/utmebvpxrw/api/python/'] = \
+    URL_DATA['http://localhost/job/utmebvpxrw/%s' % config.JENKINS_API] = \
         {}
 
 
-    URL_DATA['http://localhost:8080/queue/api/python/'] = \
+    URL_DATA['http://localhost:8080/queue/%s' % config.JENKINS_API] = \
         {'items': [{'actions': [{'causes': [{'shortDescription': 'Started by user anonymous',
                                      'userId': None,
                                      'userName': 'anonymous'}]}],
@@ -104,4 +105,4 @@ class TestQueue(unittest.TestCase):
         self.assertIsInstance(j, Job)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()

diff --git a/jenkinsapi_tests/unittests/test_views.py b/jenkinsapi_tests/unittests/test_views.py
index f7a26d33d16cf07ff3daa31762ab8d50a9a68008..b6a50c1994c2f1707043b726bd8ce2ecc351f79c 100644 (file)
--- a/jenkinsapi_tests/unittests/test_views.py
+++ b/jenkinsapi_tests/unittests/test_views.py
@@ -1,5 +1,6 @@
 import mock
 import unittest
+from jenkinsapi import config
 from jenkinsapi.view import View
 from jenkinsapi.jenkins import Jenkins
 from jenkinsapi.jenkinsbase import JenkinsBase
@@ -37,9 +38,9 @@ class TestViews(unittest.TestCase):
         """
         def mockGetData(JJ, url):
             DATA = {}
-            DATA['http://localhost:8080/api/python/'] = \
+            DATA['http://localhost:8080/%s' % config.JENKINS_API] = \
                 {'views':[dict(name='NewView', url='http://xxxxx/yyyy')]}
-            DATA['http://xxxxx/yyyy/api/python/'] = \
+            DATA['http://xxxxx/yyyy/%s' % config.JENKINS_API] = \
                 {}
 
             try: