From 5caa198ba412acba91765969941b7807c966bca9 Mon Sep 17 00:00:00 2001 From: Sergey Motornyuk Date: Wed, 12 Jul 2017 16:45:01 +0300 Subject: [PATCH] fixed legacy test after openid removal --- ckan/tests/legacy/models/test_user.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/ckan/tests/legacy/models/test_user.py b/ckan/tests/legacy/models/test_user.py index 1c90b30826f..097f581292a 100644 --- a/ckan/tests/legacy/models/test_user.py +++ b/ckan/tests/legacy/models/test_user.py @@ -1,7 +1,9 @@ # encoding: utf-8 +from nose import SkipTest from nose.tools import assert_equal + from ckan.tests.legacy import * import ckan.model as model from ckan.lib.create_test_data import CreateTestData @@ -14,8 +16,8 @@ class TestUser: def setup_class(self): CreateTestData.create_user('brian', password='pass', fullname='Brian', email='brian@brian.com') - CreateTestData.create_user(openid='http://sandra.owndomain.com/', - fullname='Sandra') + CreateTestData.create_user('sandra', password='pass', + fullname='Sandra', email='sandra@sandra.com') @classmethod def teardown_class(self): @@ -28,7 +30,7 @@ def test_0_basic(self): assert_equal(out.fullname, 'Brian') assert_equal(out.email, u'brian@brian.com') - out = model.User.by_openid(u'http://sandra.owndomain.com/') + out = model.User.by_name(u'sandra') assert_equal(out.fullname, u'Sandra') def test_1_timestamp_any_existing(self): @@ -37,24 +39,25 @@ def test_1_timestamp_any_existing(self): def test_2_timestamp_new(self): user = model.User() - openid = u'http://xyz.com' - user.name = openid + name = u'xyz' + user.name = name model.Session.add(user) model.repo.commit_and_remove() - out = model.User.by_name(openid) + out = model.User.by_name(name) assert len(str(out.created)) > 5, out.created def test_3_get(self): out = model.User.get(u'brian') assert out.fullname == u'Brian' - out = model.User.get(u'http://sandra.owndomain.com/') + out = model.User.get(u'sandra') assert out.fullname == u'Sandra' def test_4_get_openid_missing_slash(self): + raise SkipTest(u'OpenID is not used anymore') # browsers seem to lose the double slash - out = model.User.get(u'http:/sandra.owndomain.com/') + out = model.User.get(u'sandra') assert out assert out.fullname == u'Sandra' @@ -186,4 +189,3 @@ def test_search(self): 'tester' in test_names and 'testsysadmin' in test_names ), \ "Search for test should find tester and testsysadmin (only)" -