From 6b8c97331fc58d9fea43ac88b1706cbd590f1f08 Mon Sep 17 00:00:00 2001 From: Salim Fadhley Date: Mon, 17 Jun 2013 00:37:28 +0100 Subject: [PATCH] corrected one of the api-methods --- jenkinsapi/api.py | 2 +- jenkinsapi_tests/systests/test_views.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jenkinsapi/api.py b/jenkinsapi/api.py index 887c396..124e70f 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.get_view(view_name) + return jenkinsci.views()[view_name] def get_nested_view_from_url(url): """ diff --git a/jenkinsapi_tests/systests/test_views.py b/jenkinsapi_tests/systests/test_views.py index 00a3afe..e1a0e74 100644 --- a/jenkinsapi_tests/systests/test_views.py +++ b/jenkinsapi_tests/systests/test_views.py @@ -3,7 +3,9 @@ System tests for `jenkinsapi.jenkins` module. ''' import logging import unittest + from jenkinsapi.view import View +from jenkinsapi.api import get_view_from_url from jenkinsapi_tests.systests.base import BaseSystemTest from jenkinsapi_tests.test_utils.random_strings import random_string @@ -19,10 +21,15 @@ class TestViews(BaseSystemTest): self.assertIn(view_name, self.jenkins.views()) self.assertIsInstance(v, View) + # Can we use the API comnvenience methods + v2 = get_view_from_url(v.baseurl) + self.assertEquals(v, v2) + def test_create_and_delete_views(self): self._create_job() view1_name = random_string() 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()) -- 2.7.4