URL: https://github.com/SSSD/sssd/pull/532
Author: fidencio
Title: #532: TESTS: Fix E501 pep8 issues on test_netgroup.py
Action: synchronized
To pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/532/head:pr532
git checkout pr532
From 501cfcf585922957120f94d00cb6fdcbf88d9959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fiden...@redhat.com>
Date: Mon, 12 Mar 2018 08:54:54 +0100
Subject: [PATCH] TESTS: Fix E501 pep8 issues on test_netgroup.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
E501: line too long (longer than 79 characters)
The issue was inserted in commit 0f8add07b8, which has been pushed just
before the pep8 patches got merged.
The whole file was changed in order to adapt to the changes proposed to
this patch.
Signed-off-by: Fabiano Fidêncio <fiden...@redhat.com>
---
src/tests/intg/test_netgroup.py | 135 ++++++++++++++++++++--------------------
1 file changed, 68 insertions(+), 67 deletions(-)
diff --git a/src/tests/intg/test_netgroup.py b/src/tests/intg/test_netgroup.py
index 06a1cfafd..d0e2c6a76 100644
--- a/src/tests/intg/test_netgroup.py
+++ b/src/tests/intg/test_netgroup.py
@@ -30,7 +30,8 @@
import ds_openldap
import ldap_ent
from util import unindent
-import sssd_netgroup
+from sssd_nss import NssReturnCode
+from sssd_netgroup import get_sssd_netgroups
LDAP_BASE_DN = "dc=example,dc=com"
@@ -210,8 +211,8 @@ def test_add_empty_netgroup(add_empty_netgroup):
Adding empty netgroup.
"""
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("empty_netgroup")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("empty_netgroup")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == []
@@ -244,29 +245,29 @@ def test_add_tripled_netgroup(add_tripled_netgroup):
Adding netgroup with triplet.
"""
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("host", "user", "domain")]
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("adv_tripled_netgroup")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("adv_tripled_netgroup")
+ assert res == NssReturnCode.SUCCESS
assert sorted(netgrps) == sorted([("host1", "user1", "domain1"),
("host2", "user2", "domain2")])
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup_no_domain")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup_no_domain")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("host", "user", "")]
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup_no_user")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup_no_user")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("host", "", "domain")]
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup_no_host")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup_no_host")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("", "user", "domain")]
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup_none")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup_none")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("", "", "")]
@@ -308,43 +309,43 @@ def test_add_mixed_netgroup(add_mixed_netgroup):
Adding many netgroups of different type.
"""
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup1")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == []
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup2")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == []
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup3")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup3")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [("host1", "user1", "domain1")]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup4")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup4")
+ assert res == NssReturnCode.SUCCESS
assert sorted(netgroups) == sorted([("host2", "user2", "domain2"),
("host3", "user3", "domain3")])
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup5")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup5")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [("host4", "user4", "domain4")]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup6")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup6")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [("host5", "user5", "domain5")]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup7")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup7")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [("host1", "user1", "domain1")]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup8")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup8")
+ assert res == NssReturnCode.SUCCESS
assert sorted(netgroups) == sorted([("host1", "user1", "domain1"),
("host2", "user2", "domain2"),
("host3", "user3", "domain3")])
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("mixed_netgroup9")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("mixed_netgroup9")
+ assert res == NssReturnCode.SUCCESS
assert sorted(netgroups) == sorted([("host1", "user1", "domain1"),
("host2", "user2", "domain2"),
("host3", "user3", "domain3"),
@@ -374,12 +375,12 @@ def test_remove_step_by_step(remove_step_by_step, ldap_conn):
ent_list = remove_step_by_step
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("rm_empty_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("rm_empty_netgroup1")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host1', 'user1', 'domain1')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("rm_empty_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("rm_empty_netgroup2")
+ assert res == NssReturnCode.SUCCESS
assert sorted(netgroups) == sorted([('host1', 'user1', 'domain1'),
('host2', 'user2', 'domain2')])
@@ -390,12 +391,12 @@ def test_remove_step_by_step(remove_step_by_step, ldap_conn):
if subprocess.call(["sss_cache", "-N"]) != 0:
raise Exception("sssd_cache failed")
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("rm_empty_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.NOTFOUND
+ res, _, netgroups = get_sssd_netgroups("rm_empty_netgroup1")
+ assert res == NssReturnCode.NOTFOUND
assert netgroups == []
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("rm_empty_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("rm_empty_netgroup2")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host2', 'user2', 'domain2')]
# removing of rm_empty_netgroup2
@@ -405,12 +406,12 @@ def test_remove_step_by_step(remove_step_by_step, ldap_conn):
if subprocess.call(["sss_cache", "-N"]) != 0:
raise Exception("sssd_cache failed")
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("rm_empty_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.NOTFOUND
+ res, _, netgroups = get_sssd_netgroups("rm_empty_netgroup1")
+ assert res == NssReturnCode.NOTFOUND
assert netgroups == []
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("rm_empty_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.NOTFOUND
+ res, _, netgroups = get_sssd_netgroups("rm_empty_netgroup2")
+ assert res == NssReturnCode.NOTFOUND
assert netgroups == []
@@ -438,16 +439,16 @@ def test_removing_nested_netgroups(removing_nested_netgroups, ldap_conn):
netgrp_dn = 'cn=t2841_netgroup3,ou=Netgroups,' + ldap_conn.ds_inst.base_dn
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup1")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host1', 'user1', 'domain1')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup2")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host2', 'user2', 'domain2')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup3")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup3")
+ assert res == NssReturnCode.SUCCESS
assert sorted(netgroups) == sorted([('host1', 'user1', 'domain1'),
('host2', 'user2', 'domain2')])
@@ -461,16 +462,16 @@ def test_removing_nested_netgroups(removing_nested_netgroups, ldap_conn):
if subprocess.call(["sss_cache", "-N"]) != 0:
raise Exception("sssd_cache failed")
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup1")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host1', 'user1', 'domain1')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup2")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host2', 'user2', 'domain2')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup3")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup3")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host2', 'user2', 'domain2')]
# removing of t2841_netgroup2 from t2841_netgroup3
@@ -483,28 +484,28 @@ def test_removing_nested_netgroups(removing_nested_netgroups, ldap_conn):
if subprocess.call(["sss_cache", "-N"]) != 0:
raise Exception("sssd_cache failed")
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup1")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup1")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host1', 'user1', 'domain1')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup2")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup2")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == [('host2', 'user2', 'domain2')]
- res, _, netgroups = sssd_netgroup.get_sssd_netgroups("t2841_netgroup3")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgroups = get_sssd_netgroups("t2841_netgroup3")
+ assert res == NssReturnCode.SUCCESS
assert netgroups == []
def test_offline_netgroups(add_tripled_netgroup):
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("host", "user", "domain")]
subprocess.check_call(["sss_cache", "-N"])
simulate_offline()
- res, _, netgrps = sssd_netgroup.get_sssd_netgroups("tripled_netgroup")
- assert res == sssd_netgroup.NssReturnCode.SUCCESS
+ res, _, netgrps = get_sssd_netgroups("tripled_netgroup")
+ assert res == NssReturnCode.SUCCESS
assert netgrps == [("host", "user", "domain")]
_______________________________________________
sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org
To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org
