diff options
Diffstat (limited to 'tests/test_xmlrpc')
-rw-r--r-- | tests/test_xmlrpc/test_automount_plugin.py | 18 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_group_plugin.py | 10 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_host_plugin.py | 4 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_hostgroup_plugin.py | 6 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_netgroup_plugin.py | 12 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_rolegroup_plugin.py | 6 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_service_plugin.py | 10 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_taskgroup_plugin.py | 8 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_user_plugin.py | 6 | ||||
-rw-r--r-- | tests/test_xmlrpc/xmlrpc_test.py | 6 |
10 files changed, 43 insertions, 43 deletions
diff --git a/tests/test_xmlrpc/test_automount_plugin.py b/tests/test_xmlrpc/test_automount_plugin.py index e2a3bd6f..e8137521 100644 --- a/tests/test_xmlrpc/test_automount_plugin.py +++ b/tests/test_xmlrpc/test_automount_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_automount' module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Service(XMLRPC_test): @@ -70,7 +70,7 @@ class test_Service(XMLRPC_test): """ try: res = api.Command['automount_addkey'](**self.key_kw) - except errors2.DuplicateEntry: + except errors.DuplicateEntry: pass else: assert False @@ -145,7 +145,7 @@ class test_Service(XMLRPC_test): # Verify that it is gone try: res = api.Command['automount_showkey'](**delkey_kw) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -160,7 +160,7 @@ class test_Service(XMLRPC_test): # Verify that it is gone try: res = api.Command['automount_showmap'](self.mapname) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -173,7 +173,7 @@ class test_Service(XMLRPC_test): key_kw={'automountmapname': self.mapname, 'automountkey': self.keyname2} try: res = api.Command['automount_showkey'](**key_kw) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -216,7 +216,7 @@ class test_Indirect(XMLRPC_test): # Verify that it is gone try: res = api.Command['automount_showkey'](**delkey_kw) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -231,7 +231,7 @@ class test_Indirect(XMLRPC_test): # Verify that it is gone try: res = api.Command['automount_showmap'](self.mapname) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -274,7 +274,7 @@ class test_IndirectNoParent(XMLRPC_test): # Verify that it is gone try: res = api.Command['automount_showkey'](**delkey_kw) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -289,7 +289,7 @@ class test_IndirectNoParent(XMLRPC_test): # Verify that it is gone try: res = api.Command['automount_showmap'](self.mapname) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py index c40f4c9d..a3e85479 100644 --- a/tests/test_xmlrpc/test_group_plugin.py +++ b/tests/test_xmlrpc/test_group_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_group` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Group(XMLRPC_test): @@ -52,7 +52,7 @@ class test_Group(XMLRPC_test): """ try: res = api.Command['group_add'](**self.kw) - except errors2.DuplicateEntry: + except errors.DuplicateEntry: pass def test_add3(self): @@ -195,7 +195,7 @@ class test_Group(XMLRPC_test): # Verify that it is gone try: res = api.Command['group_show'](self.cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -210,7 +210,7 @@ class test_Group(XMLRPC_test): # Verify that it is gone try: res = api.Command['group_show'](self.cn2) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -225,7 +225,7 @@ class test_Group(XMLRPC_test): # Verify that it is gone try: res = api.Command['group_show'](self.cnposix) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py index 2529868c..11676d08 100644 --- a/tests/test_xmlrpc/test_host_plugin.py +++ b/tests/test_xmlrpc/test_host_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_host` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Host(XMLRPC_test): @@ -117,7 +117,7 @@ class test_Host(XMLRPC_test): # Verify that it is gone try: res = api.Command['host_show'](self.cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_hostgroup_plugin.py b/tests/test_xmlrpc/test_hostgroup_plugin.py index 4b0d6592..34aea672 100644 --- a/tests/test_xmlrpc/test_hostgroup_plugin.py +++ b/tests/test_xmlrpc/test_hostgroup_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_hostgroup` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Host(XMLRPC_test): @@ -123,7 +123,7 @@ class test_Host(XMLRPC_test): # Verify that it is gone try: res = api.Command['hostgroup_show'](self.cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -138,7 +138,7 @@ class test_Host(XMLRPC_test): # Verify that it is gone try: res = api.Command['host_show'](self.host_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py index 33c7b419..90db4633 100644 --- a/tests/test_xmlrpc/test_netgroup_plugin.py +++ b/tests/test_xmlrpc/test_netgroup_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_netgroup` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors def is_member_of(members, candidate): @@ -259,7 +259,7 @@ class test_Netgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['netgroup_show'](self.ng_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -275,7 +275,7 @@ class test_Netgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['host_show'](self.host_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -287,7 +287,7 @@ class test_Netgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['hostgroup_show'](self.hg_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -299,7 +299,7 @@ class test_Netgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['user_show'](self.user_uid) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -311,7 +311,7 @@ class test_Netgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['group_show'](self.group_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_rolegroup_plugin.py b/tests/test_xmlrpc/test_rolegroup_plugin.py index 0912736c..37135b2e 100644 --- a/tests/test_xmlrpc/test_rolegroup_plugin.py +++ b/tests/test_xmlrpc/test_rolegroup_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/rolegroup` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Rolegroup(XMLRPC_test): @@ -122,7 +122,7 @@ class test_Rolegroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['rolegroup_show'](self.cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -137,7 +137,7 @@ class test_Rolegroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['group_show'](self.rolegroup_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py index 2a3c90ba..d1b348ee 100644 --- a/tests/test_xmlrpc/test_service_plugin.py +++ b/tests/test_xmlrpc/test_service_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_service` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Service(XMLRPC_test): @@ -51,7 +51,7 @@ class test_Service(XMLRPC_test): kw={'principal':self.hostprincipal} try: res = api.Command['service_add'](**kw) - except errors2.HostService: + except errors.HostService: pass else: assert False @@ -63,7 +63,7 @@ class test_Service(XMLRPC_test): kw={'principal': u'foo'} try: res = api.Command['service_add'](**kw) - except errors2.MalformedServicePrincipal: + except errors.MalformedServicePrincipal: pass else: assert False @@ -75,7 +75,7 @@ class test_Service(XMLRPC_test): kw={'principal': u'HTTP/foo@FOO.NET'} try: res = api.Command['service_add'](**kw) - except errors2.RealmMismatch: + except errors.RealmMismatch: pass else: assert False @@ -107,7 +107,7 @@ class test_Service(XMLRPC_test): # Verify that it is gone try: res = api.Command['service_show'](self.principal) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_taskgroup_plugin.py b/tests/test_xmlrpc/test_taskgroup_plugin.py index ee4a5bba..4dc7228f 100644 --- a/tests/test_xmlrpc/test_taskgroup_plugin.py +++ b/tests/test_xmlrpc/test_taskgroup_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/taskgroup` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_Taskgroup(XMLRPC_test): @@ -152,7 +152,7 @@ class test_Taskgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['taskgroup_show'](self.cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -167,7 +167,7 @@ class test_Taskgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['group_show'](self.taskgroup_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False @@ -182,7 +182,7 @@ class test_Taskgroup(XMLRPC_test): # Verify that it is gone try: res = api.Command['rolegroup_show'](self.rolegroup_cn) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py index 20051140..87334045 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/tests/test_xmlrpc/test_user_plugin.py @@ -24,7 +24,7 @@ Test the `ipalib/plugins/f_user` module. import sys from xmlrpc_test import XMLRPC_test from ipalib import api -from ipalib import errors2 +from ipalib import errors class test_User(XMLRPC_test): @@ -55,7 +55,7 @@ class test_User(XMLRPC_test): """ try: res = api.Command['user_add'](**self.kw) - except errors2.DuplicateEntry: + except errors.DuplicateEntry: pass def test_doshow(self): @@ -140,7 +140,7 @@ class test_User(XMLRPC_test): # Verify that it is gone try: res = api.Command['user_show'](self.uid) - except errors2.NotFound: + except errors.NotFound: pass else: assert False diff --git a/tests/test_xmlrpc/xmlrpc_test.py b/tests/test_xmlrpc/xmlrpc_test.py index 7ff43c74..83ee7b5d 100644 --- a/tests/test_xmlrpc/xmlrpc_test.py +++ b/tests/test_xmlrpc/xmlrpc_test.py @@ -25,7 +25,7 @@ import sys import socket import nose from ipalib import api, request -from ipalib import errors2 +from ipalib import errors # Initialize the API. We do this here so that one can run the tests # individually instead of at the top-level. If API.bootstrap() @@ -50,9 +50,9 @@ class XMLRPC_test(object): if not api.Backend.xmlclient.isconnected(): api.Backend.xmlclient.connect() res = api.Command['user_show'](u'notfound') - except errors2.NetworkError: + except errors.NetworkError: raise nose.SkipTest() - except errors2.NotFound: + except errors.NotFound: pass def tearDown(self): |