Changed tests to include full paths to keys and other files.

Previously, the result of test was dependent on the current directory.

tests/cert.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA1ECrSVVGxHDjCm+gLdGoTPCTeIgTRvin0cE9M6s/GkD0ta3T
+y6DClu8GiBml+PQfQtSya5Ezv8EuUXhFhNCpR+3/vMwUjYLBzH5ybAB/NBRL8MJ1
+M7WUzm+WSnl1hdYMolX1xy2cy2Um5saItubMONhhVG+hFAsyy9iCDX+FV8anrOPp
+CBuYK1B0BaBSafMDus3SR+xq8T6LgTelwr3srJm6Q6A2AzdBsCkm+WcKW534ClRb
+MYfMaJQlBYpmtnQt/k8ctUWX1k/kIAJ7GR5Wh/7555wCcVJbnoc4iNgPs1KyNfmH
+v2RiEr2lf0BmxpkzUGnNQNaOVqB1/D1ygsNMAwIDAQABAoIBAQDUMOqMX5Jl5K01
+y66I3+avNHtZrkAHXaL4UYVL2FE3f+SklGj+U3L1zXPsMCf7IKL3/wd3/iuL8ibK
+D8EALFJvtIFMT4HkjuoL9AWT71M7z2a0BNOCpG9liazoO1DAQeNTjzgsrW7o7/Da
+GXSn1UgpNDjpXsfb7+4SWBp8QBYgTok/dx/nZyewZsVtkCsnwrm26Y2k8nhynLm1
+nGkQBbRKweQJ5O3PrsrZhRO9OXJ10WK/lYHVqRnu4dam8iP8JHKz5CQN/O7x0HI5
+VHHAl0Az4+YZe8wrdNhgtkkOhGxwOtIK5Q3eV8st51YBpWbMiDtQ53ghisWtyNzg
+EyphOksxAoGBAO1bTWHsuo6srY4cEJJlJ/C7W237iUM2p9MkeOwcewSXtgY19jAb
+IalYzn+yIHLqMyJ1H4cA1sBXBooNvkjVd+7niBbE8du2LyHf4avhNHN2tgKIOjpj
+GCsitLEqhyQmUUlYC3z8tQbh99b7fqn2kBDnhdSWPojEx84eXQ71IhMPAoGBAOTs
+lQ2iT3cqyore02YOieDwSg7n4flAPPG6cTGGQeOyHpNllTy9U/wyEBrHGGSCkjHI
+uDICHtYxyBmL6b0H5IyT4vn1Wxm19ecy8zbuK7Lmwd/iWRfKlGr+YQuez/mHVcCG
+YMoQvS6j8WOrQxt2wdOMNatgJeJSz66TaRy2QWfNAoGBAOmTWNJN8MSon15itdgq
+3aQj6/SOfOR866h3ktvfpxu85C62eZ+bg4OwVf4J367WVB3LnovvQmYi/ddrcN8h
+2xVqGV020D+DyFwQgnbvdvtNTg2t24dLryP70k8qZ7UmVAXWM+/6i3bLdmbENUCy
+19Ea1XN/quhSpcFr1e37Q133AoGAD5GLXX8BWoBdf+5BgDpS5CpTTwo0EwhsXKAq
+XIzd5EdTzwBkktnpYUhiUf/iR8udd6dH55a/VB/UlPAv+DwWLf1MvWUTSf9W9t8/
+LSgrbqJE4x34oyaSy2f7X5fwWu76RPqekH9s7kQWAYo/KRn9eo6Zg8spKGgrWZsK
+1foLHq0CgYBJRjKEY79aNuKCJZw60QPpXodJ65RJufXPz9MgDdoxUOtno8eYPfep
+KWWyhJsQXhMJNUMZGvQXRXaaZ3ZZp1e1q18CLh1TqbInC1ODW3L/ZAWCpT9ihcdA
+Owj1RL042er59qut/nivipmB5fn1hTbRDLq9rng0fsNU9XlrETbUfg==
+-----END RSA PRIVATE KEY-----

tests/cert.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC3zCCAcegAwIBAgIBATANBgkqhkiG9w0BAQUFADA0MRgwFgYDVQQDEw9UaGUg
+Y29kZSB0ZXN0ZXIxGDAWBgNVBAoTD1VtZWEgVW5pdmVyc2l0eTAeFw0xMjA4MjEx
+MTAyMjFaFw0xMzA4MjExMTAyMjFaMDIxCzAJBgNVBAYTAlNFMSMwIQYDVQQDExpP
+cGVuSUQgQ29ubmVjdCBUZXN0IFNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANRAq0lVRsRw4wpvoC3RqEzwk3iIE0b4p9HBPTOrPxpA9LWt08ug
+wpbvBogZpfj0H0LUsmuRM7/BLlF4RYTQqUft/7zMFI2Cwcx+cmwAfzQUS/DCdTO1
+lM5vlkp5dYXWDKJV9cctnMtlJubGiLbmzDjYYVRvoRQLMsvYgg1/hVfGp6zj6Qgb
+mCtQdAWgUmnzA7rN0kfsavE+i4E3pcK97KyZukOgNgM3QbApJvlnClud+ApUWzGH
+zGiUJQWKZrZ0Lf5PHLVFl9ZP5CACexkeVof++eecAnFSW56HOIjYD7NSsjX5h79k
+YhK9pX9AZsaZM1BpzUDWjlagdfw9coLDTAMCAwEAATANBgkqhkiG9w0BAQUFAAOC
+AQEAIeLXKI+XukIcWHY67N9NqdWWhBi8HIygbvt6bNOlM9dFIBvc68LQIZSrJd/6
+AKs07N+mY9rewYFcORrgI6767Gd/vzu+HhEMpFgJnipPjBq6XuwzLSOPRHIOGMcx
+gLmHa/ALDhQq+ma4eghpxjYM4hY8VOXPRLzGE+WqOFc/PTUIxDRT5yk0ct+XlCdC
+mCRA9BnJfYG2ABsf2GtfNK2aXMIbCC/n9c/NNkffc2aXGImalj18BZzYW8TWNQt9
+Ypx4GMUpDZu8CLaddGHoAxZgar6+BLSwO8FWB5XiFLOH/OEai9o+LZZbSebL4fyl
+yST8CMkOK8hBl1tHmEWbknlH5A==
+-----END CERTIFICATE-----

tests/pinit.py

@@ -1,3 +1,5 @@
+import os
+
 from mako.lookup import TemplateLookup
 from mako.runtime import UNDEFINED
 from oic.utils.authn.authn_context import AuthnBroker
@@ -13,6 +15,9 @@ from oic.oic.provider import Provider
 from oic.utils.keyio import KeyBundle, keybundle_from_local_file
 from oic.utils.keyio import KeyJar
 
+
+BASE_PATH = os.path.dirname(__file__)
+
 CLIENT_CONFIG = {
     "client_id": "number5",
     "ca_certs": "/usr/local/etc/oic/ca_certs.txt",
@@ -49,7 +54,7 @@ KC_SYM = KeyBundle([{"kty": "oct", "key": CLIENT_SECRET, "use": "ver"},
 KC_SYM2 = KeyBundle([{"kty": "oct", "key": "drickyoughurt", "use": "sig"},
                       {"kty": "oct", "key": "drickyoughurt", "use": "ver"}])
 
-KC_RSA = keybundle_from_local_file("rsa.key",
+KC_RSA = keybundle_from_local_file("%s/rsa.key" % BASE_PATH,
                                    "rsa", ["ver", "sig"])
 
 KEYJAR = KeyJar()

tests/test_authn.py

@@ -21,12 +21,14 @@ __author__ = 'rolandh'
 
 PASSWD = {"user": "hemligt"}
 
-ROOT = '../oidc_example/op1/'
+BASE_PATH = os.path.dirname(__file__)
+
+ROOT = '%s/../oidc_example/op1/' % BASE_PATH
 tl = TemplateLookup(directories=[ROOT + 'templates', ROOT + 'htdocs'],
                     module_directory=ROOT + 'modules',
                     input_encoding='utf-8', output_encoding='utf-8')
 
-_key = rsa_load("rsa.key")
+_key = rsa_load("%s/rsa.key" % BASE_PATH)
 
 KC_RSA = KeyBundle([{"key": _key, "kty": "RSA", "use": "ver"},
                     {"key": _key, "kty": "RSA", "use": "sig"}])

tests/test_keyio.py

@@ -1,3 +1,4 @@
+import os
 import json
 from jwkest.jwe import JWE
 
@@ -12,8 +13,10 @@ from oic.utils.keyio import RSAKey
 from jwkest.jws import JWS, NoSuitableSigningKeys, WrongTypeOfKey
 
 
-RSAKEY = "../oidc_example/op1/certs/mycert.key"
-RSA0 = "rsa.key"
+BASE_PATH = os.path.dirname(__file__)
+
+RSAKEY = "%s/cert.key" % BASE_PATH
+RSA0 = "%s/rsa.key" % BASE_PATH
 
 JWK0 = {"keys": [
     {'kty': 'RSA', 'e': 'AQAB', 'kid': "abc",
@@ -125,7 +128,7 @@ def test_keyjar_remove_key():
 
 
 def test_local_jwk_file():
-    kb = keybundle_from_local_file("file://jwk.json", "jwk", ["ver", "sig"])
+    kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwk", ["ver", "sig"])
     assert len(kb) == 1
     kj = KeyJar()
     kj.issuer_keys[""] = [kb]
@@ -138,7 +141,7 @@ def test_local_jwk_file():
 
 def test_signing():
     # Signing is only possible if key is a private RSA key
-    kb = keybundle_from_local_file("rsa.key", "rsa", ["ver", "sig"])
+    kb = keybundle_from_local_file("%s/rsa.key" % BASE_PATH, "rsa", ["ver", "sig"])
     assert len(kb) == 2
     kj = KeyJar()
     kj.issuer_keys[""] = [kb]
@@ -153,7 +156,7 @@ def test_signing():
 
 
 def test_kid_usage():
-    kb = keybundle_from_local_file("file://jwk.json", "jwk", ["ver", "sig"])
+    kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwk", ["ver", "sig"])
     kj = KeyJar()
     kj.issuer_keys["https://example.com"] = [kb]
 
@@ -163,7 +166,7 @@ def test_kid_usage():
 
 
 def test_dump_own_keys():
-    kb = keybundle_from_local_file("file://jwk.json", "jwk", ["ver", "sig"])
+    kb = keybundle_from_local_file("file://%s/jwk.json" % BASE_PATH, "jwk", ["ver", "sig"])
     assert len(kb) == 1
     kj = KeyJar()
     kj.issuer_keys[""] = [kb]

tests/test_oic.py

@@ -3,6 +3,7 @@
 
 __author__ = 'rohe0002'
 
+import os
 import time
 import json
 import urllib
@@ -55,7 +56,9 @@ CLIENT_ID = "client_1"
 
 KC_SYM_S = KeyBundle({"kty": "oct", "key": "abcdefghijklmnop", "use": "sig"})
 
-_key = rsa_load("rsa.key")
+BASE_PATH = os.path.dirname(__file__)
+
+_key = rsa_load("%s/rsa.key" % BASE_PATH)
 KC_RSA = KeyBundle({"key": _key, "kty": "RSA", "use": "sig"})
 
 KEYJ = KeyJar()

tests/test_oic_consumer.py

@@ -1,3 +1,7 @@
+import os
+import shutil
+import tempfile
+
 from oic.oic.message import AccessTokenResponse, AuthorizationResponse
 from oic.utils.keyio import KeyBundle, keybundle_from_local_file
 from oic.utils.keyio import KeyJar
@@ -22,7 +26,9 @@ CLIENT_ID = "client_1"
 KC_SYM_VS = KeyBundle({"kty": "oct", "key": "abcdefghijklmnop", "use": "ver"})
 KC_SYM_S = KeyBundle({"kty": "oct", "key": "abcdefghijklmnop", "use": "sig"})
 
-KC_RSA = keybundle_from_local_file("rsa.key",
+BASE_PATH = os.path.dirname(__file__)
+
+KC_RSA = keybundle_from_local_file("%s/rsa.key" % BASE_PATH,
                                    "rsa", ["ver", "sig"])
 
 SRVKEYS = KeyJar()
@@ -185,9 +191,10 @@ class TestOICConsumer():
         assert authreq["client_id"] == self.consumer.client_id
 
     def test_begin_file(self):
+        tempdir = tempfile.mkdtemp()
         self.consumer.config["request_method"] = "file"
-        self.consumer.config["temp_dir"] = "./file"
-        self.consumer.config["temp_path"] = "/tmp/"
+        self.consumer.config["temp_dir"] = tempdir
+        self.consumer.config["temp_path"] = tempdir
         self.consumer.config["authz_page"] = "/authz"
         srv = Server()
         srv.keyjar = SRVKEYS
@@ -206,6 +213,8 @@ class TestOICConsumer():
         assert authreq["scope"] == self.consumer.config["scope"]
         assert authreq["client_id"] == self.consumer.client_id
         assert authreq["redirect_uri"].startswith("http://localhost:8087/authz")
+        # Cleanup the file we have created
+        shutil.rmtree(tempdir)
 
     def test_complete(self):
         mfos = MyFakeOICServer("http://localhost:8088")

tests/test_oic_provider.py

@@ -1,3 +1,5 @@
+import os
+
 from mako.lookup import TemplateLookup
 from oic.oauth2 import rndstr
 from oic.utils.authn.authn_context import AuthnBroker
@@ -68,6 +70,8 @@ SERVER_INFO = {
     #"x509_url":"https://connect-op.heroku.com/cert.pem"
 }
 
+BASE_PATH = os.path.dirname(__file__)
+
 CLIENT_SECRET = "abcdefghijklmnop"
 CLIENT_ID = "client_1"
 
@@ -76,7 +80,7 @@ KC_SYM = KeyBundle([{"kty": "oct", "key": CLIENT_SECRET, "use": "ver"},
 KC_SYM2 = KeyBundle([{"kty": "oct", "key": "drickyoughurt", "use": "sig"},
                       {"kty": "oct", "key": "drickyoughurt", "use": "ver"}])
 
-KC_RSA = keybundle_from_local_file("rsa.key",
+KC_RSA = keybundle_from_local_file("%s/rsa.key" % BASE_PATH,
                                    "RSA", ["ver", "sig"])
 
 KEYJAR = KeyJar()

tests/test_x_claims.py

@@ -8,7 +8,7 @@ from oic.utils.authn.client import verify_client
 from oic.utils.authn.user import UserAuthnMethod
 from oic.utils.authz import AuthzHandling
 from oic.utils.userinfo import UserInfo
-from pinit import KEYJAR
+from pinit import BASE_PATH, KEYJAR
 
 __author__ = 'rohe0002'
 
@@ -147,7 +147,7 @@ def test_srv2():
     srv = ClaimsServer("pyoicserv", SessionDB(), CDB, USERINFO, verify_client,
                        keyjar=KEYJAR, dist_claims_mode=ClaimsMode(USER2MODE))
 
-    srv.keyjar[""] = keybundle_from_local_file("rsa.key", "rsa", ["ver", "sig"])
+    srv.keyjar[""] = keybundle_from_local_file("%s/rsa.key" % BASE_PATH, "rsa", ["ver", "sig"])
 
     assert srv