[X2Go-Commits] [x2gobroker] 03/05: update test files to new situations in upstream code
git-admin at x2go.org
git-admin at x2go.org
Thu Apr 3 12:24:54 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit db723ab4a04c8aa21a42486b24aeb81a67214221
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Apr 3 12:20:06 2014 +0200
update test files to new situations in upstream code
---
x2gobroker/tests/test_broker_base.py | 133 +++++++++++++--------------
x2gobroker/tests/test_broker_zeroconf.py | 73 ++++++++-------
x2gobroker/tests/test_client_plain_base.py | 9 +-
x2gobroker/tests/test_web_plain_base.py | 10 +-
x2gobroker/tests/test_web_plain_zeroconf.py | 6 +-
5 files changed, 117 insertions(+), 114 deletions(-)
diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py
index 46dd49c..af1b20a 100644
--- a/x2gobroker/tests/test_broker_base.py
+++ b/x2gobroker/tests/test_broker_base.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright (C) 2012-2014 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
#
@@ -29,7 +28,7 @@ class TestX2GoBrokerBackendBase(unittest.TestCase):
def _init_base_backend(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = "" # use the config that derives directly from the config defaults
tf = tempfile.NamedTemporaryFile()
print >> tf, _config
@@ -40,9 +39,9 @@ class TestX2GoBrokerBackendBase(unittest.TestCase):
def test_is_enabled(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
-[base]
+[broker_base]
enable = false
"""
tf = tempfile.NamedTemporaryFile()
@@ -51,7 +50,7 @@ enable = false
base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults)
self.assertEqual(base_backend.is_enabled(), False)
_config = """
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -65,12 +64,12 @@ enable = true
def test_getauthenticationmechanism(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
default-auth-mech = foo-auth-mech
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -82,7 +81,7 @@ enable = true
[global]
default-auth-mech = foo-auth-mech
-[base]
+[broker_base]
enable = true
auth-mech = bar-auth-mech
"""
@@ -97,12 +96,12 @@ auth-mech = bar-auth-mech
def test_getuserdbservice(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
default-user-db = foo-user-db
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -114,7 +113,7 @@ enable = true
[global]
default-user-db = foo-user-db
-[base]
+[broker_base]
enable = true
user-db = bar-user-db
"""
@@ -129,12 +128,12 @@ user-db = bar-user-db
def test_getgroupdbservice(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
default-group-db = foo-group-db
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -146,7 +145,7 @@ enable = true
[global]
default-group-db = foo-group-db
-[base]
+[broker_base]
enable = true
group-db = bar-group-db
"""
@@ -159,13 +158,13 @@ group-db = bar-group-db
def test_nameservicebase(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
default-user-db = base
default-group-db = base
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -181,13 +180,13 @@ enable = true
def test_nameservicelibnss(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
default-user-db = libnss
default-group-db = libnss
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -205,13 +204,13 @@ enable = true
def test_nameservicelibnss_primgroup(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
default-user-db = libnss
default-group-db = libnss
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -228,7 +227,7 @@ enable = true
default-user-db =
default-group-db =
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -243,7 +242,7 @@ enable = true
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -257,16 +256,16 @@ enable = true
def test_check_access_nocreds(self):
_config_defaults = copy.deepcopy(x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS)
- _config_defaults.update({'base': {'enable': True, }, })
+ _config_defaults.update({'broker_base': {'enable': True, }, })
_config = """
[global]
-check-credentials = false
+require-password = false
"""
tf = tempfile.NamedTemporaryFile()
print >> tf, _config
tf.seek(0)
base_backend = base.X2GoBroker(config_file=tf.name, config_defaults=_config_defaults)
- self.assertEqual(base_backend.check_access(), True)
+ self.assertEqual(base_backend.check_access()[0], True)
tf.close()
### TEST PROFILE DEFAULTS: get_profile_defaults()
@@ -274,40 +273,40 @@ check-credentials = false
def test_getdefaultprofile(self):
base_backend = self._init_base_backend()
_expected_profile = {
- 'command': 'TERMINAL',
- 'defsndport': True,
- 'useiconv': False,
- 'iconvfrom': 'UTF-8',
- 'height': 600,
- 'export': '',
- 'quality': 9,
- 'fullscreen': False,
- 'layout': '',
- 'useexports': True,
- 'width': 800,
- 'speed': 2,
- 'soundsystem': 'pulse',
- 'print': True,
- 'type': 'auto',
- 'sndport': 4713,
- 'xinerama': True,
- 'variant': '',
- 'usekbd': True,
- 'fstunnel': True,
- 'applications': ['TERMINAL','WWWBROWSER','MAILCLIENT','OFFICE'],
- 'multidisp': False,
- 'sshproxyport': 22,
- 'sound': True,
- 'rootless': True,
- 'iconvto': 'UTF-8',
- 'soundtunnel': True,
- 'dpi': 96,
- 'sshport': 22,
- 'setdpi': 0,
- 'pack': '16m-jpeg',
- 'user': '',
- 'host': [u'localhost'],
- 'directrdp': False,
+ u'command': u'TERMINAL',
+ u'defsndport': True,
+ u'useiconv': False,
+ u'iconvfrom': u'UTF-8',
+ u'height': 600,
+ u'export': u'',
+ u'quality': 9,
+ u'fullscreen': False,
+ u'layout': u'',
+ u'useexports': True,
+ u'width': 800,
+ u'speed': 2,
+ u'soundsystem': u'pulse',
+ u'print': True,
+ u'type': u'auto',
+ u'sndport': 4713,
+ u'xinerama': True,
+ u'variant': u'',
+ u'usekbd': True,
+ u'fstunnel': True,
+ u'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE'],
+ u'multidisp': False,
+ u'sshproxyport': 22,
+ u'sound': True,
+ u'rootless': True,
+ u'iconvto': u'UTF-8',
+ u'soundtunnel': True,
+ u'dpi': 96,
+ u'sshport': 22,
+ u'setdpi': 0,
+ u'user': u'BROKER_USER',
+ u'pack': u'16m-jpeg',
+ u'host': [u'localhost'],
+ u'directrdp': False,
}
_profile = base_backend.get_profile_defaults()
self.assertEqual(len(_expected_profile.keys()), len(_profile.keys()))
@@ -442,7 +441,7 @@ check-credentials = false
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -465,7 +464,7 @@ enable = true
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -518,7 +517,7 @@ enable = true
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -540,7 +539,7 @@ default-user-db = testsuite
default-group-db = testsuite
ignore-primary-group-memberships = true
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -562,7 +561,7 @@ default-user-db = testsuite
default-group-db = testsuite
ignore-primary-group-memberships = false
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -585,7 +584,7 @@ enable = true
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -651,7 +650,7 @@ enable = true
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -1016,7 +1015,7 @@ enable = true
default-user-db = testsuite
default-group-db = testsuite
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py
index 95fe41d..e51105b 100644
--- a/x2gobroker/tests/test_broker_zeroconf.py
+++ b/x2gobroker/tests/test_broker_zeroconf.py
@@ -27,44 +27,46 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase):
### TEST: list_profiles() method
def test_profilelist(self):
+ _save_maxDiff = self.maxDiff
+ self.maxDiff = None
list_of_profiles = {
'unittest': {
- 'user': u'',
- 'defsndport': True,
- 'useiconv': False,
- 'iconvfrom': u'UTF-8',
- 'height': 600,
- 'export': u'',
- 'quality': 9,
- 'fullscreen': False,
- 'layout': u'',
- 'useexports': 1,
- 'width': 800,
- 'speed': 2,
- 'soundsystem': u'pulse',
- 'print': True,
- 'type': u'auto',
- 'sndport': 4713,
- 'xinerama': True,
- 'variant': u'',
- 'usekbd': True,
- 'fstunnel': True,
- 'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE',],
- 'host': u'localhost',
- 'multidisp': 0,
- 'sshproxyport': 22,
- 'sound': True,
- 'rootless': 0,
- 'name': u'LOCALHOST',
- 'iconvto': u'UTF-8',
- 'soundtunnel': True,
- 'command': 'KDE',
- 'dpi': 96,
- 'sshport': 22,
- 'setdpi': 0,
- 'pack': u'16m-jpeg',
+ u'user': u'',
+ u'defsndport': True,
+ u'useiconv': False,
+ u'iconvfrom': u'UTF-8',
+ u'height': 600,
+ u'export': u'',
+ u'quality': 9,
+ u'fullscreen': False,
+ u'layout': u'',
+ u'useexports': 1,
+ u'width': 800,
+ u'speed': 2,
+ u'soundsystem': u'pulse',
+ u'print': True,
+ u'type': u'auto',
+ u'sndport': 4713,
+ u'xinerama': True,
+ u'variant': u'',
+ u'usekbd': True,
+ u'fstunnel': True,
+ u'applications': [u'TERMINAL',u'WWWBROWSER',u'MAILCLIENT',u'OFFICE',],
+ u'host': u'localhost',
+ u'multidisp': 0,
+ u'sshproxyport': 22,
+ u'sound': True,
+ u'rootless': 0,
+ u'name': u'LOCALHOST',
+ u'iconvto': u'UTF-8',
+ u'soundtunnel': True,
+ u'command': 'KDE',
+ u'dpi': 96,
+ u'sshport': 22,
+ u'setdpi': 0,
+ u'pack': u'16m-jpeg',
# make sure, hard-coded defaults end up in the list_profiles() output of the zeroconf backend, as well
- 'directrdp': False,
+ u'directrdp': False,
},
}
zeroconf_backend = x2gobroker.brokers.zeroconf_broker.X2GoBroker()
@@ -76,6 +78,7 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase):
_key: list_of_profiles['unittest']
}
self.assertEqual(_profiles, _test_profiles)
+ self.maxDiff = _save_maxDiff
### TEST: select_profile() method
diff --git a/x2gobroker/tests/test_client_plain_base.py b/x2gobroker/tests/test_client_plain_base.py
index 250758a..d13cfbe 100644
--- a/x2gobroker/tests/test_client_plain_base.py
+++ b/x2gobroker/tests/test_client_plain_base.py
@@ -45,7 +45,7 @@ class TestX2GoBrokerClientPlainBase(unittest.TestCase):
a = args()
_config = """
-[base]
+[broker_base]
enable = false
"""
tf = tempfile.NamedTemporaryFile()
@@ -56,7 +56,7 @@ enable = false
assert_equal(r, None)
tf.close()
_config = """
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -65,7 +65,8 @@ enable = true
_cf_bak = x2gobroker.defaults.X2GOBROKER_CONFIG
x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name
r = x2gobroker.client.plain.X2GoBrokerClient().get(a)
- assert_equal(r, "Access granted\n")
+ lines = r.split('\n')
+ assert_equal(lines[1], "Access granted")
tf.close()
x2gobroker.defaults.X2GOBROKER_CONFIG = _cf_bak
@@ -80,7 +81,7 @@ enable = true
a = args()
_config = """
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py
index b1f5ee5..92727e3 100644
--- a/x2gobroker/tests/test_web_plain_base.py
+++ b/x2gobroker/tests/test_web_plain_base.py
@@ -36,7 +36,7 @@ class TestX2GoBrokerWebPlainBase(unittest.TestCase):
def test_isenabled(self):
_config = """
-[base]
+[broker_base]
enable = false
"""
tf = tempfile.NamedTemporaryFile()
@@ -49,7 +49,7 @@ enable = false
assert_equal(r.status, 404)
tf.close()
_config = """
-[base]
+[broker_base]
enable = true
"""
tf = tempfile.NamedTemporaryFile()
@@ -67,9 +67,9 @@ enable = true
def test_checkaccess(self):
testApp = TestApp(application)
r = testApp.get('/plain/base/', expect_errors=True)
- assert_equal(r.status, 401)
+ assert_equal(r.status, 404)
_config = """
-[base]
+[broker_base]
enable = true
auth-mech = testsuite
"""
@@ -87,7 +87,7 @@ auth-mech = testsuite
def test_listsessions(self):
_config = """
-[base]
+[broker_base]
enable = true
auth-mech = testsuite
"""
diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py
index cc75ebe..8da9a48 100644
--- a/x2gobroker/tests/test_web_plain_zeroconf.py
+++ b/x2gobroker/tests/test_web_plain_zeroconf.py
@@ -36,7 +36,7 @@ class TestX2GoBrokerWebPlainZeroconf(unittest.TestCase):
def test_listsessions_checkcommand(self):
_config = """
-[zeroconf]
+[broker_zeroconf]
enable = true
auth-mech = testsuite
desktop-shell = KDE
@@ -58,7 +58,7 @@ desktop-shell = KDE
r.mustcontain(no='<br />', )
tf.close()
_config = """
-[zeroconf]
+[broker_zeroconf]
enable = true
auth-mech = testsuite
desktop-shell = GNOME
@@ -84,7 +84,7 @@ desktop-shell = GNOME
def test_selectsession(self):
_config = """
-[zeroconf]
+[broker_zeroconf]
enable = true
auth-mech = testsuite
"""
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list