From 6439edc10b341bd0d0604c535fdd69a4d30b43a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 17 Nov 2010 15:22:15 +0000 Subject: [PATCH] Monotone-Parent: 2a5644700c095d7f9f967370b2341e2850d50787 Monotone-Revision: 0424d9867a100df3f516a49738937c2861ab32d7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-11-17T15:22:15 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ Tests/Integration/test-davacl.py | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f00191eac..7d600ad83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-11-17 Wolfgang Sourdeau + + * Tests/Integration/test-davacl.py (DAVPublicAccessTest.setUp): + renamed "init" method to "setUp" to force reinitialization of the + client objects before each test. + 2010-11-16 Wolfgang Sourdeau * UI/WebServerResources/generic.js: (onCASRecoverIFrameLoaded): diff --git a/Tests/Integration/test-davacl.py b/Tests/Integration/test-davacl.py index a93d7b8d0..d1fddc6a0 100755 --- a/Tests/Integration/test-davacl.py +++ b/Tests/Integration/test-davacl.py @@ -913,8 +913,7 @@ END:VCARD""" } self._deleteCard(self.subscriber_client, "old.vcf", exp_code) class DAVPublicAccessTest(unittest.TestCase): - def __init__(self, arg): - unittest.TestCase.__init__(self, arg) + def setUp(self): self.client = webdavlib.WebDAVClient(hostname, port) self.anon_client = webdavlib.WebDAVClient(hostname, port) self.dav_utility = utilities.TestUtility(self, self.client) @@ -930,7 +929,7 @@ class DAVPublicAccessTest(unittest.TestCase): options = webdavlib.HTTPOPTIONS(resource) self.anon_client.execute(options) self.assertEquals(options.response["status"], 404, - "/SOGo/so/public is unexpectedly available") + "/SOGo/public is unexpectedly available") resource = '/SOGo/dav/%s' % username options = webdavlib.HTTPOPTIONS(resource)