From 5a525ba0f03a282f34c65be4792f94bb786b6c2c Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Sun, 6 Aug 2017 19:43:40 -0400 Subject: [PATCH 1/3] Changing back to trusty --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5a408df..1f0b1ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: python -dist: precise python: - 2.7 - 3.3 From bbd2244cc4f91a5f1b2f0e6467a4e40cc2584ee9 Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Sun, 6 Aug 2017 19:49:22 -0400 Subject: [PATCH 2/3] Pin distro to trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1f0b1ef..cbd3026 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +dist: trusty python: - 2.7 - 3.3 From 5aa754b9bef742220d02d49c847b6115bee3819c Mon Sep 17 00:00:00 2001 From: Michael Lazar Date: Mon, 7 Aug 2017 00:01:02 -0400 Subject: [PATCH 3/3] Fix OSX mock on ubuntu test systems --- tests/test_terminal.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_terminal.py b/tests/test_terminal.py index 67f6ee4..8b341ec 100644 --- a/tests/test_terminal.py +++ b/tests/test_terminal.py @@ -37,7 +37,8 @@ def test_terminal_properties(terminal, config): terminal._display = None with mock.patch('rtv.terminal.sys') as sys, \ - mock.patch.dict('os.environ', {'DISPLAY': ''}): + mock.patch('os.environ', {'DISPLAY': ''}), \ + mock.patch('webbrowser._tryorder', new=[]): sys.platform = 'darwin' assert terminal.display is True