The branch, statusflag has been updated via f23bc42116e94fc7893668f247363d753cc9fd77 (commit) from 679f5a07c67afada94887db1c009458107e00209 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: x2gobroker/tests/test_web_plain_base.py | 14 ++++++++++---- x2gobroker/tests/test_web_plain_inifile.py | 6 +++--- x2gobroker/tests/test_web_plain_zeroconf.py | 6 +++--- 3 files changed, 16 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py index a31850f..74953ff 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_web_plain_base.py @@ -21,13 +21,13 @@ import unittest import tempfile from paste.fixture import TestApp from nose.tools import * +import web # Python X2GoBroker modules import x2gobroker.defaults +import x2gobroker.web.plain -from x2gobroker.web.plain import * - -urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain',) +urls = ( '/plain/(.*)', 'x2gobroker.web.plain.X2GoBrokerWeb',) app = web.application(urls, globals()) class TestX2GoBrokerWebPlainBase(unittest.TestCase): @@ -43,6 +43,7 @@ enable = false tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) + _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name testApp = TestApp(app.wsgifunc(*middleware)) r = testApp.get('/plain/base/', expect_errors=True) @@ -60,7 +61,7 @@ enable = true r = testApp.get('/plain/base/', expect_errors=True) assert_equal(r.status, 401) tf.close() - + x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak ### TEST RESPONSE: simple authentication (check_access) @@ -77,10 +78,12 @@ auth-mech = testsuite tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) + _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name r = testApp.get('/plain/base/', params={'user': 'test', 'password': 'sweet', }, expect_errors=True) assert_equal(r.status, 200) r.mustcontain('Access granted') + x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak ### TEST TASK: listsessions (nothing should be returned for the base backend) @@ -94,6 +97,7 @@ auth-mech = testsuite tf = tempfile.NamedTemporaryFile() print >> tf, _config tf.seek(0) + _cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name testApp = TestApp(app.wsgifunc(*middleware)) r = testApp.get('/plain/base/', params={'user': 'test', 'password': 'sweet', 'task': 'listsessions', }, expect_errors=True) @@ -105,6 +109,8 @@ auth-mech = testsuite r.mustcontain(no='<br>',) r.mustcontain(no='<BR />', ) r.mustcontain(no='<br />', ) + x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak + def test_suite(): diff --git a/x2gobroker/tests/test_web_plain_inifile.py b/x2gobroker/tests/test_web_plain_inifile.py index e957ed7..114e73f 100644 --- a/x2gobroker/tests/test_web_plain_inifile.py +++ b/x2gobroker/tests/test_web_plain_inifile.py @@ -21,13 +21,13 @@ import unittest import tempfile from paste.fixture import TestApp from nose.tools import * +import web # Python X2GoBroker modules import x2gobroker.defaults +import x2gobroker.web.plain -from x2gobroker.web.plain import * - -urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain',) +urls = ( '/plain/(.*)', 'x2gobroker.web.plain.X2GoBrokerWeb',) app = web.application(urls, globals()) x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS.update({'base': {'enable': True, },}) diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index 53fe01e..c258646 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -21,13 +21,13 @@ import unittest import tempfile from paste.fixture import TestApp from nose.tools import * +import web # Python X2GoBroker modules import x2gobroker.defaults +import x2gobroker.web.plain -from x2gobroker.web.plain import * - -urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain',) +urls = ( '/plain/(.*)', 'x2gobroker.web.plain.X2GoBrokerWeb',) app = web.application(urls, globals()) class TestX2GoBrokerWebPlainZeroconf(unittest.TestCase): hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).