[X2go-Commits] x2gobroker.git - master (branch) updated: 6b4fb9fc63be39e279a311614ffce9e47609d770

X2Go dev team git-admin at x2go.org
Mon Jan 28 11:27:56 CET 2013


The branch, master has been updated
       via  6b4fb9fc63be39e279a311614ffce9e47609d770 (commit)
       via  2469fd0439a5877f2685e579edf73f99863b593f (commit)
      from  ad91c637065fada49cc741eae394287382f00660 (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 -----------------------------------------------------------------
commit 6b4fb9fc63be39e279a311614ffce9e47609d770
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 28 11:28:50 2013 +0100

    (re-)add authmech for testsuite

commit 2469fd0439a5877f2685e579edf73f99863b593f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 28 11:28:00 2013 +0100

    test explicit user denial in ACLs

-----------------------------------------------------------------------

Summary of changes:
 ...{htpasswd_authmech.py => testsuite_authmech.py} |    4 +++-
 x2gobroker/tests/test_broker_inifile.py            |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)
 copy x2gobroker/authmechs/{htpasswd_authmech.py => testsuite_authmech.py} (86%)

The diff of changes is:
diff --git a/x2gobroker/authmechs/htpasswd_authmech.py b/x2gobroker/authmechs/testsuite_authmech.py
similarity index 86%
copy from x2gobroker/authmechs/htpasswd_authmech.py
copy to x2gobroker/authmechs/testsuite_authmech.py
index 0778ca0..c2aea0b 100644
--- a/x2gobroker/authmechs/htpasswd_authmech.py
+++ b/x2gobroker/authmechs/testsuite_authmech.py
@@ -22,6 +22,8 @@ class X2GoBrokerAuthMech(object):
 
     def authenticate(self, username, password):
 
-        ### TODO: implement an authentication mechanism that can use htpasswd files
+        # return C{True} for user test with password sweet... (used by the unit tests)
+        if username == 'test' and password == 'sweet':
+            return True
         return False
 
diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py
index ac33756..35b4289 100644
--- a/x2gobroker/tests/test_broker_inifile.py
+++ b/x2gobroker/tests/test_broker_inifile.py
@@ -289,6 +289,8 @@ acl-users-order = deny-allow
 user =
 cmd = KDE
 fullscreen = true
+acl-users-deny = willi
+acl-users-order = deny-allow
 """
         tfs = tempfile.NamedTemporaryFile()
         print >> tfs, _session_profiles
@@ -331,10 +333,9 @@ fullscreen = true
         list_of_profiles = inifile_backend.list_profiles(username_w)
         list_of_profile_ids = list_of_profiles.keys()
         list_of_profile_ids.sort()
-        self.assertEqual(list_of_profile_ids, ['testprofile1', 'testprofile2', 'testprofile3'])
+        self.assertEqual(list_of_profile_ids, ['testprofile1', 'testprofile2'])
         self.assertEqual(list_of_profiles['testprofile1']['cmd'], 'GNOME')
         self.assertEqual(list_of_profiles['testprofile2']['cmd'], 'XFCE')
-        self.assertEqual(list_of_profiles['testprofile3']['cmd'], 'KDE')
 
     ### TEST: select_session() method
 


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