Merge branch 'master' into custom_commands2

2016-07-15 17:10:05 -07:00
parent d058020859 91393876da
commit 789551b62d
7 changed files with 51 additions and 12 deletions
--- a/tests/test_terminal.py
+++ b/tests/test_terminal.py
@@ -37,7 +37,7 @@ def test_terminal_properties(terminal, config):
    with mock.patch('rtv.terminal.sys') as sys, \
            mock.patch.dict('os.environ', {'DISPLAY': ''}):
        sys.platform = 'darwin'
-        assert terminal.display is True
+        assert terminal.display is False

    terminal._display = None
    with mock.patch.dict('os.environ', {'DISPLAY': ':0', 'BROWSER': 'w3m'}):