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

Fix test_editor for edit-on-write behavior.

Browse Source 
Now that the editor fires editing_finished on every write, the unit
tests had to be updated.

- Add qtbot to the editor fixture to resolve `QtWarningMsg:
  QSocketNotifier: Can only be used with threads started with QThread`
- Use removePaths instead of disconnect to stop the watcher from
  signalling. This avoids an error when the editor is forcibly cleaned
  up by the tests without the signal ever being connected, but otherwise
  has the same behavior as disconnecting the singal.
- wait for a signal on write instead of proc closed
- wait for _watcher.fileChanged in test_unreadable to ensure the write
  event is fired before the test exits.
This commit is contained in:
Ryan Roden-Corrent 2017-12-29 16:08:59 -05:00
parent 8a9b98c2dc
commit 23eb6a6c53
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/misc/editor.py
View File

@ -55,7 +55,7 @@ class ExternalEditor(QObject):
def _cleanup(self): def _cleanup(self):
"""Clean up temporary files after the editor closed.""" """Clean up temporary files after the editor closed."""
assert self._remove_file is not None assert self._remove_file is not None
self._watcher.fileChanged.disconnect() self._watcher.removePaths(self._watcher.files())
if self._filename is None or not self._remove_file: if self._filename is None or not self._remove_file:
# Could not create initial file. # Could not create initial file.
return return

11
tests/unit/misc/test_editor.py
View File

@ -37,7 +37,7 @@ def patch_things(config_stub, monkeypatch, stubs):
@pytest.fixture @pytest.fixture
def editor(caplog): def editor(caplog, qtbot):
ed = editormod.ExternalEditor() ed = editormod.ExternalEditor()
yield ed yield ed
with caplog.at_level(logging.ERROR): with caplog.at_level(logging.ERROR):
@ -118,17 +118,20 @@ class TestFileHandling:
os.remove(filename) os.remove(filename)
def test_unreadable(self, message_mock, editor, caplog): def test_unreadable(self, message_mock, editor, caplog, qtbot):
"""Test file handling when closing with an unreadable file.""" """Test file handling when closing with an unreadable file."""
editor.edit("") editor.edit("")
filename = editor._filename filename = editor._filename
assert os.path.exists(filename) assert os.path.exists(filename)
os.chmod(filename, 0o077) os.chmod(filename, 0o277)
if os.access(filename, os.R_OK): if os.access(filename, os.R_OK):
# Docker container or similar # Docker container or similar
pytest.skip("File was still readable") pytest.skip("File was still readable")
with caplog.at_level(logging.ERROR): with caplog.at_level(logging.ERROR):
with qtbot.wait_signal(editor._watcher.fileChanged):
with open(filename, 'w', encoding='utf-8') as f:
f.write('unreadable')
editor._proc.finished.emit(0, QProcess.NormalExit) editor._proc.finished.emit(0, QProcess.NormalExit)
assert not os.path.exists(filename) assert not os.path.exists(filename)
msg = message_mock.getmsg(usertypes.MessageLevel.error) msg = message_mock.getmsg(usertypes.MessageLevel.error)
@ -170,10 +173,10 @@ def test_modify(qtbot, editor, initial_text, edited_text):
with open(editor._filename, 'r', encoding='utf-8') as f: with open(editor._filename, 'r', encoding='utf-8') as f:
assert f.read() == initial_text assert f.read() == initial_text
with qtbot.wait_signal(editor.editing_finished) as blocker:
with open(editor._filename, 'w', encoding='utf-8') as f: with open(editor._filename, 'w', encoding='utf-8') as f:
f.write(edited_text) f.write(edited_text)
with qtbot.wait_signal(editor.editing_finished) as blocker:
editor._proc.finished.emit(0, QProcess.NormalExit) editor._proc.finished.emit(0, QProcess.NormalExit)
assert blocker.args == [edited_text] assert blocker.args == [edited_text]