[meld] test: Fix test patching for new MeldBuffer settings binding

[Kai Willadsen <kaiw src gnome org>]

commit 68459aaae8b3439e02b48021b4d6bfabfd15bf82
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jul 5 10:49:05 2019 +1000

    test: Fix test patching for new MeldBuffer settings binding

 test/test_buffer_lines.py  | 14 +++++---------
 test/test_chunk_actions.py |  9 +++------
 2 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/test/test_buffer_lines.py b/test/test_buffer_lines.py
index b9ae85f6..3252b03c 100644
--- a/test/test_buffer_lines.py
+++ b/test/test_buffer_lines.py
@@ -37,13 +37,9 @@ text = ("""0
 ])
 def test_filter_text(line_start, line_end, expected_text):
 
-    import meld.meldbuffer
+    with mock.patch('meld.meldbuffer.bind_settings', mock.DEFAULT):
+        buf = MeldBuffer()
+        buf.set_text(text)
 
-    meld.meldbuffer.bind_settings = mock.MagicMock()
-    meld.meldbuffer.meldsettings = mock.MagicMock(style_scheme=None)
-
-    buf = MeldBuffer()
-    buf.set_text(text)
-
-    buffer_lines = BufferLines(buf)
-    assert buffer_lines[line_start:line_end] == expected_text
+        buffer_lines = BufferLines(buf)
+        assert buffer_lines[line_start:line_end] == expected_text
diff --git a/test/test_chunk_actions.py b/test/test_chunk_actions.py
index ba789e72..da3d2976 100644
--- a/test/test_chunk_actions.py
+++ b/test/test_chunk_actions.py
@@ -32,12 +32,9 @@ def test_delete_last_line_crlf(text, newline, expected_text):
 
     filediff = mock.Mock(FileDiff)
 
-    with mock.patch.multiple(
-            'meld.meldbuffer',
-            bind_settings=mock.DEFAULT, meldsettings=mock.DEFAULT):
-        with mock.patch('meld.meldbuffer.MeldBuffer.set_style_scheme'):
-            meldbuffer = meld.meldbuffer.MeldBuffer()
-            meldbuffer.set_text(text)
+    with mock.patch('meld.meldbuffer.bind_settings', mock.DEFAULT):
+        meldbuffer = meld.meldbuffer.MeldBuffer()
+        meldbuffer.set_text(text)
 
     def make_last_line_chunk(buf):
         end = buf.get_line_count()