Fixed bug in View.add_view, added unittests for View

diff --git a/jenkinsapi/view.py b/jenkinsapi/view.py
index b597badf086cc0c9e6177441e7e8fb3551d5c3b5..f9cb63c14ad025f1a09f02b8ff58484c6e3b1a50 100644 (file)
--- a/jenkinsapi/view.py
+++ b/jenkinsapi/view.py
@@ -16,10 +16,10 @@ class View(JenkinsBase):
     def __str__(self):
         return self.name
 
-    def __getitem__(self, str_job_id ):
-        assert isinstance( str_job_id, str )
-        api_url = self.python_api_url( self.get_job_url( str_job_id ) )
-        return Job( api_url, str_job_id, self.jenkins_obj )
+    def __getitem__(self, str_job_id):
+        assert isinstance(str_job_id, str)
+        api_url = self.python_api_url(self.get_job_url(str_job_id))
+        return Job(api_url, str_job_id, self.jenkins_obj)
 
     def delete(self):
         """
@@ -57,14 +57,14 @@ class View(JenkinsBase):
     def __len__(self):
         return len( self.get_job_dict().keys() )
 
-    def get_job_url( self, str_job_name ):
+    def get_job_url(self, str_job_name):
         try:
             job_dict = self.get_job_dict()
-            return job_dict[ str_job_name ]
+            return job_dict[str_job_name]
         except KeyError:
             #noinspection PyUnboundLocalVariable
-            all_views = ", ".join( job_dict.keys() )
-            raise KeyError("Job %s is not known - available: %s" % ( str_job_name, all_views ) )
+            all_views = ", ".join(job_dict.keys())
+            raise KeyError("Job %s is not known - available: %s" % (str_job_name, all_views))
 
     def get_jenkins_obj(self):
         return self.jenkins_obj
@@ -90,7 +90,6 @@ class View(JenkinsBase):
             job = self.jenkins_obj.get_job(str_job_name)
 
         jobs = self._data.setdefault('jobs', [])
-        jobs.append({'name': job.name, 'url': job.baseurl})
         data = {
             "description":"",
             "statusFilter":"",
@@ -116,7 +115,9 @@ class View(JenkinsBase):
         for job_name in self.get_job_dict().keys():
             data[job_name]='on'
         data['json'] = data.copy()
-        self.post_data('%sconfigSubmit' % self.baseurl, urllib.urlencode(data))
+        self.jenkins_obj.requester.post_and_confirm_status(
+                '%sconfigSubmit' % self.baseurl, urllib.urlencode(data))
+        self.poll()
         log.debug('Job "%s" has been added to a view "%s"' %
                      (job.name, self.name))
         return True

diff --git a/jenkinsapi_tests/unittests/test_view.py b/jenkinsapi_tests/unittests/test_view.py
index cb9a8c61ec526bde8b0b420ab5ca3c44ca30d8da..cb41453e3a97787d203f46e3a25fc4110caf12c4 100644 (file)
--- a/jenkinsapi_tests/unittests/test_view.py
+++ b/jenkinsapi_tests/unittests/test_view.py
@@ -1,27 +1,66 @@
 import mock
 import unittest
 
+from jenkinsapi.jenkinsbase import JenkinsBase
+from jenkinsapi.jenkins import Jenkins
 from jenkinsapi.view import View
+from jenkinsapi.job import Job
 
 class TestView(unittest.TestCase):
 
     DATA = {'description': 'Important Shizz',
-            'jobs': [{'color': 'blue',
-                      'name': 'foo',
-                      'url': 'http://halob:8080/job/foo/'},
-           {'color': 'red',
-            'name': 'test_jenkinsapi',
-            'url': 'http://halob:8080/job/test_jenkinsapi/'}],
+            'jobs': [
+                {'color': 'blue',
+                 'name': 'foo',
+                 'url': 'http://halob:8080/job/foo/'},
+                {'color': 'red',
+                 'name': 'test_jenkinsapi',
+                 'url': 'http://halob:8080/job/test_jenkinsapi/'}
+            ],
             'name': 'FodFanFo',
             'property': [],
             'url': 'http://halob:8080/view/FodFanFo/'}
 
+    JOB_DATA = {"actions": [],
+            "description": "test job",
+            "displayName": "foo",
+            "displayNameOrNull": None,
+            "name": "foo",
+            "url": "http://halob:8080/job/foo/",
+            "buildable": True,
+            "builds": [{"number": 3, "url": "http://halob:8080/job/foo/3/"},
+           {"number": 2, "url": "http://halob:8080/job/foo/2/"},
+                {"number": 1, "url": "http://halob:8080/job/foo/1/"}],
+            "color": "blue",
+            "firstBuild": {"number": 1, "url": "http://halob:8080/job/foo/1/"},
+            "healthReport": [{"description": "Build stability: No recent builds failed.",
+                             "iconUrl": "health-80plus.png", "score": 100}],
+            "inQueue": False,
+            "keepDependencies": False,
+            "lastBuild": {"number": 3, "url": "http://halob:8080/job/foo/3/"},
+            "lastCompletedBuild": {"number": 3, "url": "http://halob:8080/job/foo/3/"},
+            "lastFailedBuild": None,
+            "lastStableBuild": {"number": 3, "url": "http://halob:8080/job/foo/3/"},
+            "lastSuccessfulBuild": {"number": 3, "url": "http://halob:8080/job/foo/3/"},
+            "lastUnstableBuild": None,
+            "lastUnsuccessfulBuild": None,
+            "nextBuildNumber": 4,
+            "property": [],
+            "queueItem": None,
+            "concurrentBuild": False,
+            "downstreamProjects": [],
+            "scm": {},
+            "upstreamProjects": []}
+
+    @mock.patch.object(Job, '_poll')
     @mock.patch.object(View, '_poll')
-    def setUp(self, _poll):
-        _poll.return_value = self.DATA
+    def setUp(self, _view_poll, _job_poll):
+        _view_poll.return_value = self.DATA
+        _job_poll.return_value = self.JOB_DATA
 
         # def __init__(self, url, name, jenkins_obj)
         self.J = mock.MagicMock()  # Jenkins object
+        self.J.has_job.return_value = False
         self.v = View('http://localhost:800/view/FodFanFo', 'FodFanFo', self.J)
 
     def testRepr(self):
@@ -33,5 +72,71 @@ class TestView(unittest.TestCase):
             self.v.id()
         self.assertEquals(self.v.name, 'FodFanFo')
 
+    @mock.patch.object(JenkinsBase, '_poll')
+    def test_iteritems(self, _poll):
+        _poll.return_value = self.JOB_DATA
+        for job_name, job_obj in self.v.iteritems():
+            self.assertTrue(isinstance(job_obj, Job))
+
+    def test_get_job_dict(self):
+        jobs = self.v.get_job_dict()
+        self.assertEquals(jobs, {
+            'foo': 'http://halob:8080/job/foo/',
+            'test_jenkinsapi': 'http://halob:8080/job/test_jenkinsapi/'})
+
+    def test_len(self):
+        self.assertEquals(len(self.v), 2)
+
+    # We have to re-patch JenkinsBase here because by the time
+    # it get to create Job, MagicMock will already expire
+    @mock.patch.object(JenkinsBase, '_poll')
+    def test_getitem(self, _poll):
+        _poll.return_value = self.JOB_DATA
+        self.assertTrue(isinstance(self.v['foo'], Job))
+
+    def test_delete(self):
+        self.v.delete()
+        self.assertTrue(self.v.deleted)
+
+    def test_get_job_url(self):
+        self.assertEquals(
+                self.v.get_job_url('foo'), 'http://halob:8080/job/foo/')
+
+    def test_wrong_get_job_url(self):
+        with self.assertRaises(KeyError):
+            self.v.get_job_url('bar')
+
+    # We have to re-patch JenkinsBase here because by the time
+    # it get to create Job, MagicMock will already expire
+    @mock.patch.object(JenkinsBase, '_poll')
+    @mock.patch.object(View, '_poll')
+    def test_add_job(self, _poll, _view_poll):
+        _poll.return_value = self.DATA
+        _view_poll.return_value = self.DATA
+        J = mock.MagicMock()  # Jenkins object
+        J.has_job.return_value = True
+        v = View('http://localhost:800/view/FodFanFo', 'FodFanFo', self.J)
+
+        result = v.add_job('bar')
+        self.assertFalse(result)
+
+
+    # We have to re-patch JenkinsBase here because by the time
+    # it get to create Job, MagicMock will already expire
+    @mock.patch.object(Jenkins, 'has_job')
+    def test_add_wrong_job(self, _has_job):
+        _has_job.return_value = False
+        result = self.v.add_job('bar')
+        self.assertFalse(result)
+
+    def test_add_existing_job(self):
+        result = self.v.add_job('foo')
+        self.assertFalse(result)
+
+    def test_get_nested_view_dict(self):
+        result = self.v.get_nested_view_dict()
+        self.assertTrue(isinstance(result, dict))
+        self.assertEquals(len(result), 0)
+
 if __name__ == '__main__':
     unittest.main()