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

importer: fix style issues

Browse Source
This commit is contained in:
Ryan Farley 2017-11-15 20:00:14 -06:00
parent 2b6763ad13
commit e2169d2d92
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/unit/scripts/test_importer.py
View File

@ -18,8 +18,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>. # along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
import pytest
import os import os
import pytest
from scripts import importer from scripts import importer
_samples = 'tests/unit/scripts/importer_sample' _samples = 'tests/unit/scripts/importer_sample'
@ -27,19 +27,28 @@ _samples = 'tests/unit/scripts/importer_sample'
def qm_expected(input_format): def qm_expected(input_format):
"""Read expected quickmark-formatted output.""" """Read expected quickmark-formatted output."""
with open(os.path.join(_samples, input_format, 'quickmarks'), 'r', encoding='utf-8') as f: with open(
os.path.join(_samples, input_format, 'quickmarks'),
'r',
encoding='utf-8') as f:
return f.read() return f.read()
def bm_expected(input_format): def bm_expected(input_format):
"""Read expected bookmark-formatted output.""" """Read expected bookmark-formatted output."""
with open(os.path.join(_samples, input_format, 'bookmarks'), 'r', encoding='utf-8') as f: with open(
os.path.join(_samples, input_format, 'bookmarks'),
'r',
encoding='utf-8') as f:
return f.read() return f.read()
def search_expected(input_format): def search_expected(input_format):
"""Read expected search-formatted (config.py) output.""" """Read expected search-formatted (config.py) output."""
with open(os.path.join(_samples, input_format, 'config_py'), 'r', encoding='utf-8') as f: with open(
os.path.join(_samples, input_format, 'config_py'),
'r',
encoding='utf-8') as f:
return f.read() return f.read()
@ -98,31 +107,36 @@ def test_chrome_searches(capsys):
def test_netscape_bookmarks(capsys): def test_netscape_bookmarks(capsys):
importer.import_netscape_bookmarks(sample_input('netscape'), ['bookmark', 'keyword'], 'bookmark') importer.import_netscape_bookmarks(
sample_input('netscape'), ['bookmark', 'keyword'], 'bookmark')
imported = capsys.readouterr()[0] imported = capsys.readouterr()[0]
assert imported == bm_expected('netscape') assert imported == bm_expected('netscape')
def test_netscape_quickmarks(capsys): def test_netscape_quickmarks(capsys):
importer.import_netscape_bookmarks(sample_input('netscape'), ['bookmark', 'keyword'], 'quickmark') importer.import_netscape_bookmarks(
sample_input('netscape'), ['bookmark', 'keyword'], 'quickmark')
imported = capsys.readouterr()[0] imported = capsys.readouterr()[0]
assert imported == qm_expected('netscape') assert imported == qm_expected('netscape')
def test_netscape_searches(capsys): def test_netscape_searches(capsys):
importer.import_netscape_bookmarks(sample_input('netscape'), ['search'], 'search') importer.import_netscape_bookmarks(
sample_input('netscape'), ['search'], 'search')
imported = capsys.readouterr()[0] imported = capsys.readouterr()[0]
assert imported == search_expected('netscape') assert imported == search_expected('netscape')
def test_mozilla_bookmarks(capsys): def test_mozilla_bookmarks(capsys):
importer.import_moz_places(sample_input('mozilla'), ['bookmark', 'keyword'], 'bookmark') importer.import_moz_places(
sample_input('mozilla'), ['bookmark', 'keyword'], 'bookmark')
imported = capsys.readouterr()[0] imported = capsys.readouterr()[0]
assert imported == bm_expected('mozilla') assert imported == bm_expected('mozilla')
def test_mozilla_quickmarks(capsys): def test_mozilla_quickmarks(capsys):
importer.import_moz_places(sample_input('mozilla'), ['bookmark', 'keyword'], 'quickmark') importer.import_moz_places(
sample_input('mozilla'), ['bookmark', 'keyword'], 'quickmark')
imported = capsys.readouterr()[0] imported = capsys.readouterr()[0]
assert imported == qm_expected('mozilla') assert imported == qm_expected('mozilla')