From 78e26a4747e11ddca15f2fe78d511c7d225e2097 Mon Sep 17 00:00:00 2001 From: Aleksey Maksimov Date: Thu, 11 Jul 2013 00:10:32 +0800 Subject: [PATCH] Chnged views() to views in tests and examples --- examples/how_to/create_nested_views.py | 22 +++++++++---------- jenkinsapi/api.py | 2 +- jenkinsapi/view.py | 2 +- jenkinsapi_tests/systests/base.py | 4 ++-- jenkinsapi_tests/systests/test_views.py | 38 ++++++++++++++++----------------- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/how_to/create_nested_views.py b/examples/how_to/create_nested_views.py index fab8892..224205a 100644 --- a/examples/how_to/create_nested_views.py +++ b/examples/how_to/create_nested_views.py @@ -20,24 +20,24 @@ j = api.create_job(jobname=jobName, config=xml) # Create ListView in main view logger.info('Attempting to create new nested view') -top_view = api.views().create('TopView', Views.NESTED_VIEW) +top_view = api.views.create('TopView', Views.NESTED_VIEW) logger.info('top_view is %s' % top_view) if top_view == None: logger.error('View was not created') else: logger.info('View has been created') -print 'top_view.views()=', top_view.views().keys() +print 'top_view.views=', top_view.views.keys() logger.info('Attempting to create view inside nested view') -sub_view = top_view.views().create('SubView') +sub_view = top_view.views.create('SubView') if sub_view == None: logger.info('View was not created') else: logger.error('View has been created') logger.info('Attempting to delete sub_view') -del top_view.views()['SubView'] -if 'SubView' in top_view.views(): +del top_view.views['SubView'] +if 'SubView' in top_view.views: logger.error('SubView was not deleted') else: logger.info('SubView has been deleted') @@ -45,22 +45,22 @@ else: # Another way of creating sub view # This way sub view will have jobs in it logger.info('Attempting to create view with jobs inside nested view') -top_view.views()['SubView'] = jobName -if 'SubView' not in top_view.views(): +top_view.views['SubView'] = jobName +if 'SubView' not in top_view.views: logger.error('View was not created') else: logger.info('View has been created') logger.info('Attempting to delete sub_view') -del top_view.views()['SubView'] -if 'SubView' in top_view.views(): +del top_view.views['SubView'] +if 'SubView' in top_view.views: logger.error('SubView was not deleted') else: logger.info('SubView has been deleted') logger.info('Attempting to delete top view') -del api.views()['TopView'] -if 'TopView' not in api.views(): +del api.views['TopView'] +if 'TopView' not in api.views: logger.info('View has been deleted') else: logger.error('View was not deleted') diff --git a/jenkinsapi/api.py b/jenkinsapi/api.py index 124e70f..76ef1f7 100644 --- a/jenkinsapi/api.py +++ b/jenkinsapi/api.py @@ -122,7 +122,7 @@ def get_view_from_url(url): raise BadURL("Cannot parse URL %s" % url) jenkinsurl, view_name = matched.groups() jenkinsci = Jenkins(jenkinsurl) - return jenkinsci.views()[view_name] + return jenkinsci.views[view_name] def get_nested_view_from_url(url): """ diff --git a/jenkinsapi/view.py b/jenkinsapi/view.py index 4d96074..dd6ae77 100644 --- a/jenkinsapi/view.py +++ b/jenkinsapi/view.py @@ -155,4 +155,4 @@ class View(JenkinsBase): @property def views(self): - return self.get_jenkins_obj().get_jenkins_obj_from_url(self.baseurl).views() + return self.get_jenkins_obj().get_jenkins_obj_from_url(self.baseurl).views diff --git a/jenkinsapi_tests/systests/base.py b/jenkinsapi_tests/systests/base.py index bae36d2..7506a8d 100644 --- a/jenkinsapi_tests/systests/base.py +++ b/jenkinsapi_tests/systests/base.py @@ -19,9 +19,9 @@ class BaseSystemTest(unittest.TestCase): self.jenkins.delete_job(name) def _delete_all_views(self): - all_view_names = self.jenkins.views().keys()[1:] + all_view_names = self.jenkins.views.keys()[1:] for name in all_view_names: - del self.jenkins.views()[name] + del self.jenkins.views[name] def _create_job(self, name='whatever', config=EMPTY_JOB): job = self.jenkins.create_job(name, config) diff --git a/jenkinsapi_tests/systests/test_views.py b/jenkinsapi_tests/systests/test_views.py index dda09bd..6078991 100644 --- a/jenkinsapi_tests/systests/test_views.py +++ b/jenkinsapi_tests/systests/test_views.py @@ -17,9 +17,9 @@ class TestViews(BaseSystemTest): def test_make_views(self): self._create_job() view_name = random_string() - self.assertNotIn(view_name, self.jenkins.views()) - v = self.jenkins.views().create(view_name) - self.assertIn(view_name, self.jenkins.views()) + self.assertNotIn(view_name, self.jenkins.views) + v = self.jenkins.views.create(view_name) + self.assertIn(view_name, self.jenkins.views) self.assertIsInstance(v, View) # Can we use the API convenience methods @@ -29,19 +29,19 @@ class TestViews(BaseSystemTest): def test_create_and_delete_views(self): self._create_job() view1_name = random_string() - new_view = self.jenkins.views().create(view1_name) + new_view = self.jenkins.views.create(view1_name) self.assertIsInstance(new_view, View) - self.assertIn(view1_name, self.jenkins.views()) - del self.jenkins.views()[view1_name] - self.assertNotIn(view1_name, self.jenkins.views()) + self.assertIn(view1_name, self.jenkins.views) + del self.jenkins.views[view1_name] + self.assertNotIn(view1_name, self.jenkins.views) def test_delete_view_which_does_not_exist(self): self._create_job() view1_name = random_string() - new_view = self.jenkins.views().create(view1_name) - self.assertIn(view1_name, self.jenkins.views()) - del self.jenkins.views()[view1_name] - self.assertNotIn(view1_name, self.jenkins.views()) + new_view = self.jenkins.views.create(view1_name) + self.assertIn(view1_name, self.jenkins.views) + del self.jenkins.views[view1_name] + self.assertNotIn(view1_name, self.jenkins.views) def test_make_nested_views(self): job = self._create_job() @@ -49,20 +49,20 @@ class TestViews(BaseSystemTest): sub1_view_name = random_string() sub2_view_name = random_string() - self.assertNotIn(top_view_name, self.jenkins.views()) - tv = self.jenkins.views().create(top_view_name, Views.NESTED_VIEW) - self.assertIn(top_view_name, self.jenkins.views()) + self.assertNotIn(top_view_name, self.jenkins.views) + tv = self.jenkins.views.create(top_view_name, Views.NESTED_VIEW) + self.assertIn(top_view_name, self.jenkins.views) self.assertIsInstance(tv, View) # Empty sub view - sv1 = tv.views().create(sub1_view_name) - self.assertIn(sub1_view_name, tv.views()) + sv1 = tv.views.create(sub1_view_name) + self.assertIn(sub1_view_name, tv.views) self.assertIsInstance(sv1, View) # Sub view with job in it - tv.views()[sub2_view_name] = job.name - self.assertIn(sub2_view_name, tv.views()) - sv2 = tv.views()[sub2_view_name] + tv.views[sub2_view_name] = job.name + self.assertIn(sub2_view_name, tv.views) + sv2 = tv.views[sub2_view_name] self.assertIsInstance(sv2, View) print 'job.name, type(job.name)=', job.name, type(job.name) self.assertTrue(job.name in sv2) -- 2.7.4