rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests/dirbrowser: normalize paths before comparing

Browse Source 
This avoids errors because some libraries use '/' even on windows, while
others use '\' on windows.
This commit is contained in:
Daniel Schadt 2016-03-24 22:02:57 +01:00
parent f6e8815871
commit c0b40aefdd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/integration/test_dirbrowser.py
View File

@ -19,6 +19,7 @@
"""Test the built-in directory browser.""" """Test the built-in directory browser."""
import os
import bs4 import bs4
import collections import collections
@ -92,7 +93,11 @@ class DirLayout:
def path(self, *parts): def path(self, *parts):
"""Return the path to the given file inside the layout folder.""" """Return the path to the given file inside the layout folder."""
return str(self.layout.join(*parts)) return os.path.normpath(str(self.layout.join(*parts)))
def base_path(self):
"""Return the path of the base temporary folder."""
return os.path.normpath(str(self.base))
def parse(self, quteproc): def parse(self, quteproc):
"""Parse the dirbrowser content from the given quteproc. """Parse the dirbrowser content from the given quteproc.
@ -107,6 +112,7 @@ class DirLayout:
# Strip off the title prefix to obtain the path of the folder that # Strip off the title prefix to obtain the path of the folder that
# we're browsing # we're browsing
path = soup.title.string[len(title_prefix):] path = soup.title.string[len(title_prefix):]
path = os.path.normpath(path)
container = soup('div', id='dirbrowserContainer')[0] container = soup('div', id='dirbrowserContainer')[0]
@ -115,6 +121,7 @@ class DirLayout:
parent = None parent = None
else: else:
parent = QUrl(parent_elem[0].li.a['href']).toLocalFile() parent = QUrl(parent_elem[0].li.a['href']).toLocalFile()
parent = os.path.normpath(parent)
folders = [] folders = []
files = [] files = []
@ -122,6 +129,7 @@ class DirLayout:
for css_class, list_ in [('folders', folders), ('files', files)]: for css_class, list_ in [('folders', folders), ('files', files)]:
for li in container('ul', class_=css_class)[0]('li'): for li in container('ul', class_=css_class)[0]('li'):
item_path = QUrl(li.a['href']).toLocalFile() item_path = QUrl(li.a['href']).toLocalFile()
item_path = os.path.normpath(item_path)
list_.append(self.Item(path=item_path, link=li.a['href'], list_.append(self.Item(path=item_path, link=li.a['href'],
text=str(li.a.string))) text=str(li.a.string)))
@ -137,14 +145,14 @@ def dir_layout(tmpdir_factory):
def test_parent_folder(dir_layout, quteproc): def test_parent_folder(dir_layout, quteproc):
quteproc.open_url(dir_layout.file_url()) quteproc.open_url(dir_layout.file_url())
page = dir_layout.parse(quteproc) page = dir_layout.parse(quteproc)
assert page.parent == str(dir_layout.base) assert page.parent == dir_layout.base_path()
def test_parent_with_slash(dir_layout, quteproc): def test_parent_with_slash(dir_layout, quteproc):
"""Test the parent link with an URL that has a trailing slash.""" """Test the parent link with an URL that has a trailing slash."""
quteproc.open_url(dir_layout.file_url() + '/') quteproc.open_url(dir_layout.file_url() + '/')
page = dir_layout.parse(quteproc) page = dir_layout.parse(quteproc)
assert page.parent == str(dir_layout.base) assert page.parent == dir_layout.base_path()
def test_enter_folder_smoke(dir_layout, quteproc): def test_enter_folder_smoke(dir_layout, quteproc):