From: Simo Sorce <simo@redhat.com>
Date: Mon, 16 Feb 2015 23:15:17 +0000 (-0500)
Subject: Change attrs test to check for fullname
X-Git-Tag: v0.4.0~22
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=dd8a2ecf15a7f74e2fe3d8c5ea0ff5e2fed20927

Change attrs test to check for fullname

We are not going to return 'extras' by default, and the only
nss attribute mapped to the 'userdata' space is the gecos (as 'fullname')

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---

diff --git a/tests/attrs.py b/tests/attrs.py
index f01dae4..f29cbb4 100755
--- a/tests/attrs.py
+++ b/tests/attrs.py
@@ -63,11 +63,7 @@ sp_a = {'hostname': '${ADDRESS}:${PORT}',
 
 def fixup_sp_httpd(httpdir):
     merge = """
-    MellonSetEnv "UID" "uidNumber"
-    MellonSetEnv "GID" "gidNumber"
-    MellonSetEnv "HOME" "homeDirectory"
-    MellonSetEnv "GECOS" "gecos"
-    MellonSetEnv "SHELL" "loginShell"
+    MellonSetEnv "FULLNAME" "fullname"
 </Location>"""
     with open(httpdir + '/conf.d/ipsilon-saml.conf', 'r') as f:
         conf = f.read()
@@ -89,7 +85,7 @@ Alias /sp ${HTTPDIR}/sp
     with open(httpdir + '/conf.d/ipsilon-saml.conf', 'a') as f:
         f.write(text)
 
-    index = """<!--#echo var="MELLON_UID" -->"""
+    index = """<!--#echo var="MELLON_FULLNAME" -->"""
     os.mkdir(httpdir + '/sp')
     with open(httpdir + '/sp/index.shtml', 'w') as f:
         f.write(index)
@@ -154,7 +150,7 @@ if __name__ == '__main__':
     try:
         page = sess.fetch_page(idpname,
                                'http://127.0.0.11:45081/sp/index.shtml')
-        page.expected_value('text()', str(userpwd[2]))
+        page.expected_value('text()', str(userpwd[4]))
     except ValueError, e:
         print >> sys.stderr, " ERROR: %s" % repr(e)
         sys.exit(1)