Fix minor bug with AttributeConsumingService. Update Travis config to test python 2.7.6 and 2.7.12

Author: pitbulk

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
-  - '2.7'
+  - '2.7.6'
+  - '2.7.12'
 
 install:
   - sudo apt-get update -qq

src/onelogin/saml2/metadata.py

@@ -96,12 +96,13 @@ def builder(sp, authnsign=False, wsign=False, valid_until=None, cache_duration=N
                     req_attr_isrequired_str = " isRequired=\"%s\"" % req_attribs['isRequired']
 
                 if 'attributeValue' in req_attribs.keys() and req_attribs['attributeValue']:
-                    req_attr_aux_str = ""
                     if isinstance(req_attribs['attributeValue'], basestring):
                         req_attribs['attributeValue'] = [req_attribs['attributeValue']]
+
+                    req_attr_aux_str = ">"
                     for attrValue in req_attribs['attributeValue']:
                         req_attr_aux_str += """
-                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion>%(attributeValue)s</saml:AttributeValue>""" % \
+                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">%(attributeValue)s</saml:AttributeValue>""" % \
                             {
                                 'attributeValue': attrValue
                             }

tests/src/OneLogin/saml2_tests/metadata_test.py

@@ -180,9 +180,9 @@ def testBuilderAttributeConsumingServiceWithMultipleAttributeValue(self):
         self.assertIn("""        <md:AttributeConsumingService index="1">
             <md:ServiceName xml:lang="en">Test Service</md:ServiceName>
             <md:ServiceDescription xml:lang="en">Test Service</md:ServiceDescription>
-            <md:RequestedAttribute Name="userType" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"
-                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion>userType</saml:AttributeValue>
-                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion>admin</saml:AttributeValue>
+            <md:RequestedAttribute Name="userType" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic">
+                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">userType</saml:AttributeValue>
+                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">admin</saml:AttributeValue>
             </md:RequestedAttribute>
             <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" FriendlyName="uid" />
         </md:AttributeConsumingService>""", metadata)