Merge pull request #42 from maennel/pass_tests

Pass tests. Thanks Manuel Jecke.
This commit is contained in:
Roland Hedberg 2014-11-05 08:25:21 +01:00
commit e443a16742
3 changed files with 29 additions and 199 deletions

215
.gitignore vendored
View File

@ -1,216 +1,35 @@
# IntelliJ project folder
.idea
.idea/.name
# Other dev-env folders and files
.vagrant
Vagrantfile
.idea/encodings.xml
# setup.py-related folders and files
build
dist
*.egg-info
.idea/inspectionProfiles/profiles_settings.xml
# Compiled files
*.pyc
.idea/inspectionProfiles/Project_Default.xml
# Logs
*.log
*.log.*
.idea/misc.xml
.idea/modules.xml
.idea/pyoidc.iml
.idea/scopes/scope_settings.xml
.idea/vcs.xml
.idea/workspace.xml
# Dynamically created doc folders
doc/_build
# Remaining stuff
oidc_example/op2/client_db.db
oidc_example/op2/config.py
oidc_example/op2/config.pyc
oidc_example/op2/modules/base.mako.py
oidc_example/op2/modules/base.mako.pyc
oidc_example/op2/modules/login.mako.py
oidc_example/op2/modules/login.mako.pyc
oidc_example/op2/modules/root.mako.py
oidc_example/op2/modules/root.mako.pyc
oidc_example/op2/modules/unauthorized.mako.py
oidc_example/op2/modules/unauthorized.mako.pyc
oidc_example/op2/oc.log
oidc_example/op2/sp.log
oidc_example/op2/sp.log.1
oidc_example/op2/sp.log.2
oidc_example/op2/sp.log.3
oidc_example/op2/sp.log.4
oidc_example/op2/sp.log.5
oidc_example/op2/sp.xml
oidc_example/op2/sp_cert/tmp_mycert.pem
oidc_example/op2/sp_cert/tmp_mykey.pem
oidc_example/op2/sp_conf.py
oidc_example/op2/sp_conf.pyc
oidc_example/op2/static/jwks.json
oidc_example/rp3/conf.py
oidc_example/rp3/conf.pyc
oidc_example/rp3/modules/opchoice.mako.pyc
oidc_example/rp3/modules/opresult.mako.py
oidc_example/rp3/modules/opresult.mako.pyc
oidc_example/rp3/oidc.pyc
oidc_example/rp3/rp.log
src/oic.egg-info/dependency_links.txt
src/oic.egg-info/not-zip-safe
src/oic.egg-info/PKG-INFO
src/oic.egg-info/requires.txt
src/oic.egg-info/SOURCES.txt
src/oic.egg-info/top_level.txt
src/oic/__init__.pyc
src/oic/exception.pyc
src/oic/oauth2/__init__.pyc
src/oic/oauth2/consumer.pyc
src/oic/oauth2/message.pyc
src/oic/oauth2/provider.pyc
src/oic/oic/__init__.pyc
src/oic/oic/message.pyc
src/oic/oic/provider.pyc
src/oic/utils/__init__.pyc
src/oic/utils/aes.pyc
src/oic/utils/authn/__init__.pyc
src/oic/utils/authn/authn_context.pyc
src/oic/utils/authn/client.pyc
src/oic/utils/authn/saml.pyc
src/oic/utils/authn/user.pyc
src/oic/utils/authz.pyc
src/oic/utils/http_util.pyc
src/oic/utils/keyio.pyc
src/oic/utils/sdb.pyc
src/oic/utils/time_util.pyc
src/oic/utils/userinfo/__init__.pyc
src/oic/utils/webfinger.pyc
update
build/lib/oic/__init__.py
build/lib/oic/exception.py
build/lib/oic/utils/authn/saml.py
build/lib/oic/utils/authn/user.py
build/lib/oic/oauth2/__init__.py
build/lib/oic/oauth2/consumer.py
build/lib/oic/oauth2/dynreg.py
build/lib/oic/oauth2/message.py
build/lib/oic/oauth2/provider.py
build/lib/oic/oic/__init__.py
build/lib/oic/oic/claims_provider.py
build/lib/oic/oic/consumer.py
build/lib/oic/oic/message.py
build/lib/oic/oic/provider.py
build/lib/oic/utils/__init__.py
build/lib/oic/utils/aes.py
build/lib/oic/utils/authn/__init__.py
build/lib/oic/utils/authn/authn_context.py
build/lib/oic/utils/authn/client.py
build/lib/oic/utils/authn/client_saml.py
build/lib/oic/utils/authn/ldap_member.py
build/lib/oic/utils/authn/ldapc.py
build/lib/oic/utils/authn/user_cas.py
build/lib/oic/utils/authz.py
build/lib/oic/utils/claims.py
build/lib/oic/utils/http_util.py
build/lib/oic/utils/keyio.py
build/lib/oic/utils/sdb.py
build/lib/oic/utils/stateless.py
build/lib/oic/utils/time_util.py
build/lib/oic/utils/userinfo/__init__.py
build/lib/oic/utils/userinfo/distaggr.py
build/lib/oic/utils/userinfo/ldap_info.py
build/lib/oic/utils/webfinger.py
dist/oic-0.5.0beta-py2.7.egg
src/oic/utils/authn/ldap_member.pyc
src/oic/utils/userinfo/ldap_info.pyc

View File

@ -17,18 +17,29 @@ Prerequisites
^^^^^^^^^^^^^
For installing pyOIDC you will need
* requests
* pycrypto
* pyjwkest
To build the documentation you will need
* alabaster
and for running the examples:
* mako
* cherrypy
* beaker
For running the tests you will additionally need to install:
* pytest
If you wish your LDAP tests to pass, ensure you have installed the following package as well:
* python-ldap
Quick build instructions
^^^^^^^^^^^^^^^^^^^^^^^^

View File

@ -23,7 +23,7 @@ PASSWD = {"user": "hemligt"}
BASE_PATH = os.path.dirname(__file__)
ROOT = '%s/../oidc_example/op1/' % BASE_PATH
ROOT = '%s/../oidc_example/op2/' % BASE_PATH
tl = TemplateLookup(directories=[ROOT + 'templates', ROOT + 'htdocs'],
module_directory=ROOT + 'modules',
input_encoding='utf-8', output_encoding='utf-8')