tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small improvements for auth tests

Browse Source
This commit is contained in:
Unrud 2017-05-31 12:01:33 +02:00
parent b10599d07d
commit f12dd31b4b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radicale/tests/test_auth.py
View File

@ -21,7 +21,6 @@ Radicale tests with simple requests and authentication.
""" """
import base64 import base64
import logging
import os import os
import shutil import shutil
import tempfile import tempfile
@ -40,7 +39,6 @@ class TestBaseAuthRequests(BaseTest):
""" """
def setup(self): def setup(self):
self.configuration = config.load() self.configuration = config.load()
self.logger = logging.getLogger("radicale_test")
self.colpath = tempfile.mkdtemp() self.colpath = tempfile.mkdtemp()
self.configuration.set("storage", "filesystem_folder", self.colpath) self.configuration.set("storage", "filesystem_folder", self.colpath)
# Disable syncing to disk for better performance # Disable syncing to disk for better performance
@ -63,14 +61,14 @@ class TestBaseAuthRequests(BaseTest):
self.configuration.set("auth", "htpasswd_encryption", self.configuration.set("auth", "htpasswd_encryption",
htpasswd_encryption) htpasswd_encryption)
self.application = Application(self.configuration, self.logger) self.application = Application(self.configuration, self.logger)
for user, password, expeced_status in ( for user, password, expected_status in (
("tmp", "bepo", 207), ("tmp", "tmp", 401), ("tmp", "", 401), ("tmp", "bepo", 207), ("tmp", "tmp", 401), ("tmp", "", 401),
("unk", "unk", 401), ("unk", "", 401), ("", "", 401)): ("unk", "unk", 401), ("unk", "", 401), ("", "", 401)):
status, headers, answer = self.request( status, headers, answer = self.request(
"PROPFIND", "/", "PROPFIND", "/",
HTTP_AUTHORIZATION="Basic %s" % base64.b64encode( HTTP_AUTHORIZATION="Basic %s" % base64.b64encode(
("%s:%s" % (user, password)).encode()).decode()) ("%s:%s" % (user, password)).encode()).decode())
assert status == expeced_status assert status == expected_status
def test_htpasswd_plain(self): def test_htpasswd_plain(self):
self._test_htpasswd("plain", "tmp:bepo") self._test_htpasswd("plain", "tmp:bepo")
@ -142,6 +140,6 @@ class TestBaseAuthRequests(BaseTest):
self.configuration.set("auth", "type", "tests.custom.auth") self.configuration.set("auth", "type", "tests.custom.auth")
self.application = Application(self.configuration, self.logger) self.application = Application(self.configuration, self.logger)
status, headers, answer = self.request( status, headers, answer = self.request(
"GET", "/", HTTP_AUTHORIZATION="dG1wOmJlcG8=") "PROPFIND", "/tmp", HTTP_AUTHORIZATION="Basic %s" %
assert status == 200 base64.b64encode(("tmp:").encode()).decode())
assert "Radicale works!" in answer assert status == 207