ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 07:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around ref #1472 by having test_drop_upload delete the non-ASCII directories it creates.

Browse Source
This commit is contained in:
david-sarah 2011-08-08 18:23:34 -07:00
parent bbed522033
commit 70f03bd615
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/allmydata/test/test_drop_upload.py
View File

@ -2,12 +2,12 @@
import os, sys import os, sys
from twisted.trial import unittest from twisted.trial import unittest
from twisted.python import filepath, runtime from twisted.python import filepath, runtime, log
from twisted.internet import defer from twisted.internet import defer
from allmydata.interfaces import IDirectoryNode, NoSuchChildError from allmydata.interfaces import IDirectoryNode, NoSuchChildError
from allmydata.util import fake_inotify from allmydata.util import fileutil, fake_inotify
from allmydata.util.encodingutil import get_filesystem_encoding from allmydata.util.encodingutil import get_filesystem_encoding
from allmydata.util.consumer import download_to_data from allmydata.util.consumer import download_to_data
from allmydata.test.no_network import GridTestMixin from allmydata.test.no_network import GridTestMixin
@ -23,6 +23,27 @@ class DropUploadTestMixin(GridTestMixin, ShouldFailMixin, ReallyEqualMixin):
with the real INotify. with the real INotify.
""" """
def setUp(self):
GridTestMixin.setUp(self)
self.nonascii_dirs = []
def tearDown(self):
try:
GridTestMixin.tearDown(self)
finally:
# kludge to work around the fact that buildbot can't remove a directory tree that has any non-ASCII directory names
if sys.platform == "win32":
for dirpath in self.nonascii_dirs:
try:
fileutil.rm_dir(dirpath)
finally:
log.err("We were unable to delete a non-ASCII directory %r created by the test. "
"This is liable to cause failures on future builds." % (dirpath,))
def _mkdir_nonascii(self, dirpath):
self.nonascii_dirs.append(dirpath)
os.mkdir(dirpath)
def _get_count(self, name): def _get_count(self, name):
return self.stats_provider.get_stats()["counters"].get(name, 0) return self.stats_provider.get_stats()["counters"].get(name, 0)
@ -36,7 +57,7 @@ class DropUploadTestMixin(GridTestMixin, ShouldFailMixin, ReallyEqualMixin):
except UnicodeEncodeError: except UnicodeEncodeError:
dirname_u = u"local_dir" dirname_u = u"local_dir"
self.local_dir = os.path.join(self.basedir, dirname_u) self.local_dir = os.path.join(self.basedir, dirname_u)
os.mkdir(self.local_dir) self._mkdir_nonascii(self.local_dir)
self.client = self.g.clients[0] self.client = self.g.clients[0]
self.stats_provider = self.client.stats_provider self.stats_provider = self.client.stats_provider