summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-12-16 14:45:37 +0100
committerTomas Babej <tbabej@redhat.com>2015-01-14 11:40:28 +0100
commit61c4ecccc1df222b153236518c9be0ac3091f94a (patch)
treef8d222fee1c359c1e7403ab914ed7f619139e721 /ipatests/test_xmlrpc
parent10fe918acd8f7428588f2dff52f64070a9328c29 (diff)
downloadfreeipa-61c4ecccc1df222b153236518c9be0ac3091f94a.tar.gz
freeipa-61c4ecccc1df222b153236518c9be0ac3091f94a.tar.xz
freeipa-61c4ecccc1df222b153236518c9be0ac3091f94a.zip
Run pylint on tests
Drop support for pylint < 1.0 Enable ignoring unknown attributes on modules (both nose and pytest use advanced techniques, support for which only made it to pylint recently) Fix some bugs revealed by pylint Do minor refactoring or add pylint:disable directives where the linter complains. Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc')
-rw-r--r--ipatests/test_xmlrpc/test_automount_plugin.py8
-rw-r--r--ipatests/test_xmlrpc/test_baseldap_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_host_plugin.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py
index 90e320730..d25c03f4f 100644
--- a/ipatests/test_xmlrpc/test_automount_plugin.py
+++ b/ipatests/test_xmlrpc/test_automount_plugin.py
@@ -45,6 +45,10 @@ class MockTextui(list):
class AutomountTest(XMLRPC_test):
"""Provides common functionality for automount tests"""
+
+ locname = u'testlocation'
+ tofiles_output = '' # To be overridden
+
def check_tofiles(self):
"""Check automountlocation_tofiles output against self.tofiles_output
"""
@@ -111,7 +115,6 @@ class test_automount(AutomountTest):
"""
Test the `automount` plugin.
"""
- locname = u'testlocation'
mapname = u'testmap'
keyname = u'testkey'
keyname_rename = u'testkey_rename'
@@ -320,7 +323,6 @@ class test_automount_direct(AutomountTest):
"""
Test the `automount` plugin indirect map functionality.
"""
- locname = u'testlocation'
mapname = u'auto.direct2'
keyname = u'/-'
direct_kw = { 'key' : keyname }
@@ -386,7 +388,6 @@ class test_automount_indirect(AutomountTest):
"""
Test the `automount` plugin indirect map functionality.
"""
- locname = u'testlocation'
mapname = u'auto.home'
keyname = u'/home'
parentmap = u'auto.master'
@@ -485,7 +486,6 @@ class test_automount_indirect_no_parent(AutomountTest):
"""
Test the `automount` plugin Indirect map function.
"""
- locname = u'testlocation'
mapname = u'auto.home'
keyname = u'/home'
mapname2 = u'auto.direct2'
diff --git a/ipatests/test_xmlrpc/test_baseldap_plugin.py b/ipatests/test_xmlrpc/test_baseldap_plugin.py
index 1a4bb0f54..d5b338887 100644
--- a/ipatests/test_xmlrpc/test_baseldap_plugin.py
+++ b/ipatests/test_xmlrpc/test_baseldap_plugin.py
@@ -153,7 +153,7 @@ def test_exc_callback_registration():
@callbacktest_base.register_exc_callback
- def exc_callback(self, keys, options, exc, call_func, *args, **kwargs):
+ def exc_callback_2(self, keys, options, exc, call_func, *args, **kwargs):
"""Callback on super class; doesn't affect the subclass"""
messages.append('Superclass registered callback')
raise exc
diff --git a/ipatests/test_xmlrpc/test_host_plugin.py b/ipatests/test_xmlrpc/test_host_plugin.py
index ead86a79a..2b1168f35 100644
--- a/ipatests/test_xmlrpc/test_host_plugin.py
+++ b/ipatests/test_xmlrpc/test_host_plugin.py
@@ -29,7 +29,7 @@ from ipalib import api, errors, x509
from ipalib.util import normalize_zone
from ipapython.dn import DN
from ipapython.dnsutil import DNSName
-from nose.tools import raises, assert_raises
+from nose.tools import raises, assert_raises # pylint: disable=E0611
from nose.plugins.skip import SkipTest
from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, XMLRPC_test,
fuzzy_uuid, fuzzy_digits, fuzzy_hash, fuzzy_date, fuzzy_issuer,