tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Perhaps actually fix this test on Windows

This commit is contained in:
Jean-Paul Calderone 2019-03-12 14:40:42 -04:00
parent 5b49fd5813
commit aef9c53be8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/test/test_magic_folder.py
View File

@ -1890,19 +1890,19 @@ class SingleMagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Reall
@inline_callbacks @inline_callbacks
def test_create_file_in_sub_directory(self): def test_create_file_in_sub_directory(self):
reldir_u = u'subdir' reldir_u = u'subdir'
# Intentionally avoid doing a platform-respecting directory separator # The OS and the DMD may have conflicting conventions for directory
# here. _create_directory_with_file can deal with any separator. # the separator. Construct a value for each.
# _get_collective_latest_file requires exactly / as a separator. dmd_relpath_u = u'/'.join((reldir_u, u'some-file'))
relpath_u = u'/'.join((reldir_u, u'some-file')) platform_relpath_u = join(reldir_u, u'some-file')
content = u'some great content' content = u'some great content'
yield self._create_directory_with_file( yield self._create_directory_with_file(
relpath_u, platform_relpath_u,
content, content,
) )
# The new directory and file should have been noticed and uploaded. # The new directory and file should have been noticed and uploaded.
downloader = self.magicfolder.downloader downloader = self.magicfolder.downloader
encoded_dir_u = magicpath.path2magic(reldir_u + u"/") encoded_dir_u = magicpath.path2magic(reldir_u + u"/")
encoded_path_u = magicpath.path2magic(relpath_u) encoded_path_u = magicpath.path2magic(dmd_relpath_u)
with start_action(action_type=u"retrieve-metadata"): with start_action(action_type=u"retrieve-metadata"):
dir_node, dir_meta = yield downloader._get_collective_latest_file( dir_node, dir_meta = yield downloader._get_collective_latest_file(