[telepathy-gabble/master] pass search terms to make_search

[Guillaume Desmottes]

---
 tests/twisted/search/search_helper.py |    3 +--
 tests/twisted/search/unextended.py    |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/search/search_helper.py b/tests/twisted/search/search_helper.py
index f1b49c9..245af53 100644
--- a/tests/twisted/search/search_helper.py
+++ b/tests/twisted/search/search_helper.py
@@ -73,8 +73,7 @@ def answer_extended_field_query(q, stream, server, fields):
 
     return _send_server_reply(q, stream, result)
 
-def make_search(q, c_search, c_props, server):
-    terms = { 'x-n-family': 'Threepwood' }
+def make_search(q, c_search, c_props, server, terms):
     call_async(q, c_search, 'Search', terms)
 
     _, ssc_event, iq_event = q.expect_many(
diff --git a/tests/twisted/search/unextended.py b/tests/twisted/search/unextended.py
index 0bfcd45..60674bb 100644
--- a/tests/twisted/search/unextended.py
+++ b/tests/twisted/search/unextended.py
@@ -55,7 +55,7 @@ def complete_search(q, bus, conn, requests, stream, server):
     assert state == cs.SEARCH_NOT_STARTED, state
 
     # We make a search.
-    iq = make_search(q, c_search, c_props, server)
+    iq = make_search(q, c_search, c_props, server, { 'x-n-family': 'Threepwood' })
     query = iq.firstChildElement()
     i = 0
     for field in query.elements():
@@ -118,7 +118,7 @@ def cancelled_while_in_progress(q, bus, conn, requests, stream, server):
     c_props = dbus.Interface(c, cs.PROPERTIES_IFACE)
     c_search = dbus.Interface(c, cs.CHANNEL_TYPE_CONTACT_SEARCH)
 
-    iq = make_search(q, c_search, c_props, server)
+    iq = make_search(q, c_search, c_props, server, { 'x-n-family': 'Threepwood' })
 
     # Before the server sends back the results, the client cancels the search.
     call_async(q, c_search, 'Stop')
-- 
1.5.6.5