Merge pull request #46 from SUNET/draft43

test fixes from rohe

Author: mikaelfrykholm

tests/subordinate/https%3A%2F%2Frp.example.com

@@ -0,0 +1 @@
+{"jwks": {"keys": [{"kty": "RSA", "use": "sig", "kid": "MHgtMFdtV2RLem5MUEhLTl9GTWN6d09yTXBFZWxWNTFiRVotRHRYUU5Edw", "e": "AQAB", "n": "kug08yUQr9E9Go7EyYG3o3I838s_O3zKXhU1641ns23Uisyv58HdTGPyYo-hnnsO2di4WU2OBd_k4k1sAhXau08u0JevHAy3lF_9U5G9pBzs61vrhlm2jKE04mSXLZjoCQ4cvIhpRbb3XQe8WJ4J5VzKkYkDa8_85HRtK2XCmxEPrd_xVQePTDWPBKY1hOiYqTyua3_i0WrUoMsq8n03JQ-tAZGRI1yKcnEefwFipWTvQcxR-hpgYDYBMoiAH-FIgdk586obYPjlH2evkeYoohEkXMakDsUWQUUKlP6_DIyT8IlqDP1jGCYH_2QEkixeC9wAbcKan2MotzsO1h3eLw"}, {"kty": "EC", "use": "sig", "kid": "Z0gyUE1mMDVzallIMFd4WDZ6cnRmZXhiLXFRcmotY1puR3BsSXhGZDhDRQ", "crv": "P-256", "x": "VhGXHRlriZoid-5LcQ-0OpBbUw-P-2IyWGLb871Lzns", "y": "xjKNE5-75mzqkW6t_Is8n3eSt-cJVfvV7QFDUZPoVMU"}]}, "authority_hints": ["https://trust_anchor.example.com"]}

tests/subordinate/https%3A%2F%2Frp.example.com.lock

@@ -369,8 +369,8 @@ def test_upstream_attribute(self):
     def test_trust_anchors_attribute(self):
         # This to deal with some strange spill over
         anchors = set(self.leaf["federation_entity"].trust_anchors.keys())
-        if "https://swamid.se" in anchors:
-            for x in ['https://swamid.se', 'https://anchor.example.com', 'https://feide.no']:
+        for x in ['https://swamid.se', 'https://anchor.example.com', 'https://feide.no']:
+            if x in anchors:
                 anchors.remove(x)
 
         assert anchors == {'https://ta.example.org', 'https://2nd.ta.example.org'}