From 3b3d79991adf38320489b9b919ee9053ce40d755 Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Thu, 3 Apr 2014 13:58:56 +0200 Subject: [PATCH 01/10] added webtest to required --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 57624f9..06eba84 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,8 @@ 'pyramid', 'pyramid_debugtoolbar', 'waitress', - 'crabpy>=0.3.0' + 'crabpy>=0.3.0', + 'webtest' ] tests_requires = [ From cf54e42acb2659fbef4ebbf0569bda4419079b94 Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Thu, 3 Apr 2014 14:13:25 +0200 Subject: [PATCH 02/10] added settings for not running capakeytests without password --- crabpy_pyramid/tests/test_utils.py | 14 +++++++++++++- nose_travis.ini | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 nose_travis.ini diff --git a/crabpy_pyramid/tests/test_utils.py b/crabpy_pyramid/tests/test_utils.py index 8d90fde..03ba753 100644 --- a/crabpy_pyramid/tests/test_utils.py +++ b/crabpy_pyramid/tests/test_utils.py @@ -14,6 +14,14 @@ from crabpy_pyramid import main +def run_capakey_integration_tests(): + from testconfig import config + from crabpy.tests import as_bool + try: + return as_bool(config['capakey']['run_integration_tests']) + except KeyError: # pragma NO COVER + return False + settings = { 'capakey.user': 'USEr', 'capakey.password': 'PSWD', @@ -50,7 +58,11 @@ def setUp(self): def tearDown(self): testing.tearDown() - + +@unittest.skipUnless( + run_capakey_integration_tests(), + 'No CAPAKEY Integration tests required' +) class CapakeyFunctionalTests(FunctionalTests): def test_list_gemeenten(self): res = self.testapp.get('/capakey/gemeenten') diff --git a/nose_travis.ini b/nose_travis.ini new file mode 100644 index 0000000..96d241d --- /dev/null +++ b/nose_travis.ini @@ -0,0 +1,7 @@ +[crab] +run_integration_tests = 1 + +[capakey] +run_integration_tests = 0 +user = user +password = password From c5c171c361407dbf0b1d8b16f90533926c9abf9b Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Thu, 3 Apr 2014 14:22:48 +0200 Subject: [PATCH 03/10] added settings for not running capakeytests without password --- nose_development.ini | 7 +++++++ tox.ini | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 nose_development.ini diff --git a/nose_development.ini b/nose_development.ini new file mode 100644 index 0000000..67efde7 --- /dev/null +++ b/nose_development.ini @@ -0,0 +1,7 @@ +[crab] +run_integration_tests = True + +[capakey] +run_integration_tests = False +user = USER +password = PASSWORD diff --git a/tox.ini b/tox.ini index 5239f49..7dd321a 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = py27, cover [testenv] commands = python setup.py develop - python setup.py nosetests -q + python setup.py nosetests --verbose deps = nose webtest From 5734ffaf9372acae9dbc75d6c0854bd63c02eca3 Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Thu, 3 Apr 2014 14:28:30 +0200 Subject: [PATCH 04/10] added nose_development.ini to nosetests --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 7dd321a..fe00b41 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = py27, cover [testenv] commands = python setup.py develop - python setup.py nosetests --verbose + python setup.py nosetests --verbose --tc-file nose_development.ini deps = nose webtest @@ -15,7 +15,7 @@ basepython = python2.7 commands = python setup.py develop - python setup.py nosetests --config nose_cover.cfg + python setup.py nosetests --config nose_cover.cfg --tc-file nose_development.ini deps = nose coverage From f2d061cf92f22a2837f84260c4746a02b792d0cb Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Thu, 3 Apr 2014 14:35:50 +0200 Subject: [PATCH 05/10] added denpendency to nose-testconfig --- tox.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tox.ini b/tox.ini index fe00b41..ecae899 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ commands = python setup.py nosetests --verbose --tc-file nose_development.ini deps = nose + nose-testconfig webtest [testenv:cover] @@ -18,5 +19,6 @@ commands = python setup.py nosetests --config nose_cover.cfg --tc-file nose_development.ini deps = nose + nose-testconfig coverage webtest From dbb873ad8f7661befe452e77efe723885b6c0db2 Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Fri, 4 Apr 2014 12:56:38 +0200 Subject: [PATCH 06/10] loading proxy from settingsfile refs #5 --- crabpy_pyramid/__init__.py | 19 +++++++++++++++---- development.ini | 2 ++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/crabpy_pyramid/__init__.py b/crabpy_pyramid/__init__.py index bc0dac0..80e43c6 100644 --- a/crabpy_pyramid/__init__.py +++ b/crabpy_pyramid/__init__.py @@ -36,7 +36,7 @@ def _parse_settings(settings): args[short_key_name] = settings.get( key_name, defaults.get(short_key_name) ) - # not set user or password + # not set user or password for short_key_name in ('user', 'password'): if ( (not short_key_name in args) or @@ -47,6 +47,10 @@ def _parse_settings(settings): capakey needs this parameter to function properly.' % short_key_name, UserWarning ) + # set proxy + args['proxy'] = get_proxy(settings) + + return args @@ -59,6 +63,13 @@ def _set_caches(settings, gateway, c): gateway.caches[name] = make_region(key_mangler=str) gateway.caches[name].configure_from_config(settings, '%s.%s.' % (c, name)) +def get_proxy(settings): + args = {} + for short_key_name in ('http', 'https'): + key_name = "proxy.%s" % (short_key_name) + if key_name in settings: + args[short_key_name] = settings.get(key_name) + return args def _build_capakey(registry): capakey = registry.queryUtility(ICapakey) @@ -79,7 +90,9 @@ def _build_crab(registry): if crab is not None: return crab settings = registry.settings - factory = crab_factory() + proxy = {} + proxy['proxy'] = get_proxy(settings) + factory = crab_factory(**proxy) gateway = CrabGateway(factory) _set_caches(settings, gateway, 'crab') @@ -130,8 +143,6 @@ def main(global_config, **settings): This function returns a Pyramid WSGI application. ''' config = Configurator(settings=settings) - - includeme(config) config.scan() diff --git a/development.ini b/development.ini index e462ee2..e7bee38 100644 --- a/development.ini +++ b/development.ini @@ -34,6 +34,8 @@ crab.long.arguments.filename: dogpile_data/crab_long.dbm crab.short.backend: dogpile.cache.dbm crab.short.expiration_time: 3600 crab.short.arguments.filename: dogpile_data/crab_short.dbm +proxy.http = http://proxy.example.com:3128 +proxy.https = https://httpsproxy.example.com:3128 # By default, the toolbar only appears for clients from IP addresses # '127.0.0.1' and '::1'. # debugtoolbar.hosts = 127.0.0.1 ::1 From fde1bb1f786de84411044e2d98c068ffccc42c01 Mon Sep 17 00:00:00 2001 From: TalissaJoly Date: Fri, 4 Apr 2014 13:10:21 +0200 Subject: [PATCH 07/10] added testconfig to travisfile --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0654204..e0ac857 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ python: install: - easy_install -U setuptools - python setup.py -q install - - pip install nose coverage + - pip install nose coverage nose-testconfig - pip install coveralls script: - nosetests --config nose_cover.cfg + nosetests --config nose_cover.cfg --tc-file nose_travis.ini after_success: coveralls From 1a36632b7fd16b88628332e527f604e706746ba6 Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Mon, 7 Apr 2014 09:35:02 +0200 Subject: [PATCH 08/10] Add webtest as dependency. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0ac857..122146e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,7 @@ python: install: - easy_install -U setuptools - python setup.py -q install - - pip install nose coverage nose-testconfig - - pip install coveralls + - pip install nose coverage nose-testconfig coveralls webtest script: nosetests --config nose_cover.cfg --tc-file nose_travis.ini after_success: From 8e8c24e7e1bd62d54fa5b6032858204ba24d905f Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Mon, 7 Apr 2014 09:36:03 +0200 Subject: [PATCH 09/10] Update dependency to CRABpy 0.3.2 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 06eba84..a3c660e 100644 --- a/setup.py +++ b/setup.py @@ -10,13 +10,13 @@ 'pyramid', 'pyramid_debugtoolbar', 'waitress', - 'crabpy>=0.3.0', - 'webtest' + 'crabpy>=0.3.2', ] tests_requires = [ 'nose', - 'coverage' + 'coverage', + 'webtest' ] testing_extras = tests_requires + [] From 3cafc4267ebda9bc68e947134c9ddafda477bf39 Mon Sep 17 00:00:00 2001 From: Koen Van Daele Date: Mon, 7 Apr 2014 09:43:14 +0200 Subject: [PATCH 10/10] Add nologcapture. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 122146e..b39d208 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,6 @@ install: - python setup.py -q install - pip install nose coverage nose-testconfig coveralls webtest script: - nosetests --config nose_cover.cfg --tc-file nose_travis.ini + nosetests --nologcapture --config nose_cover.cfg --tc-file nose_travis.ini after_success: coveralls