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

[X2Go dev team]

The branch, master has been updated
       via  c37de1ec00c8790cb5f4c7258ae12021e3d38c7a (commit)
      from  232af771abff05e145366b4cb5949fd1cf81a498 (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 c37de1ec00c8790cb5f4c7258ae12021e3d38c7a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 6 11:15:05 2012 +0100

    return 401 Unauthorized rather then 200 with output value Access Denied

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

Summary of changes:
 x2gobroker/tests/test_web_plain_base.py |    7 ++-----
 x2gobroker/web/plain.py                 |    2 +-
 2 files changed, 3 insertions(+), 6 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 f02f2c8..6c9c5c6 100644
--- a/x2gobroker/tests/test_web_plain_base.py
+++ b/x2gobroker/tests/test_web_plain_base.py
@@ -65,8 +65,7 @@ enable = true
         x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name
         testApp = TestApp(app.wsgifunc(*middleware))
         r = testApp.get('/plain/base/', expect_errors=True)
-        assert_equal(r.status, 200)
-        r.mustcontain('Access denied')
+        assert_equal(r.status, 401)
         tf.close()
 
 
@@ -76,9 +75,7 @@ enable = true
         middleware = []
         testApp = TestApp(app.wsgifunc(*middleware))
         r = testApp.get('/plain/base/', expect_errors=True)
-        assert_equal(r.status, 200)
-        r.mustcontain('Access denied')
-
+        assert_equal(r.status, 401)
         _config = """
 [base]
 enable = true
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index 0601df2..9dff1dc 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -146,4 +146,4 @@ class X2GoBrokerWebPlain:
 
             return output
 
-        return "Access denied"
+        return web.unauthorized()


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