[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 1a77bd8337305a0996a8e1fc17ec81b3a8197670

X2Go dev team git-admin at x2go.org
Tue Jun 4 21:09:36 CEST 2013


The branch, statusflag has been updated
       via  1a77bd8337305a0996a8e1fc17ec81b3a8197670 (commit)
      from  93478923dd6bf64fcea8fa4b3cebfaf9e8b288ee (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:
 .../test_web_plain_inifile.py}                     |   28 +++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)
 copy x2gobroker/{authmechs/pam_authmech.py => tests/test_web_plain_inifile.py} (59%)

The diff of changes is:
diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/tests/test_web_plain_inifile.py
similarity index 59%
copy from x2gobroker/authmechs/pam_authmech.py
copy to x2gobroker/tests/test_web_plain_inifile.py
index fca5ec0..e957ed7 100644
--- a/x2gobroker/authmechs/pam_authmech.py
+++ b/x2gobroker/tests/test_web_plain_inifile.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2012 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 #
 # X2Go Session Broker is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -18,15 +17,26 @@
 # Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import pam
+import unittest
+import tempfile
+from paste.fixture import TestApp
+from nose.tools import *
 
-class X2GoBrokerAuthMech(object):
+# Python X2GoBroker modules
+import x2gobroker.defaults
 
-    def authenticate(self, username, password):
+from x2gobroker.web.plain import *
 
-        # do a simple PAM authentication against the PAM service ,,x2gobroker''
-        if username and password:
-            if pam.authenticate(username, password, service="x2gobroker"):
-                return True
+urls = ( '/plain/(.*)', 'X2GoBrokerWebPlain',)
+app = web.application(urls, globals())
 
-        return False
+x2gobroker.defaults.X2GOBROKER_CONFIG_DEFAULTS.update({'base': {'enable': True, },})
+
+class TestX2GoBrokerWebPlainInifile(unittest.TestCase):
+    pass
+
+def test_suite():
+    from unittest import TestSuite, makeSuite
+    suite = TestSuite()
+    suite.addTest(makeSuite(TestX2GoBrokerWebPlainInifile))
+    return suite


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).




More information about the x2go-commits mailing list