[telepathy-gabble/master] Resync with wocky master which doesn't chain up to the real resolver.

[Mike Ruprecht]

---
 tests/twisted/test-resolver.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/twisted/test-resolver.c b/tests/twisted/test-resolver.c
index cd5cd7a..dffdc32 100644
--- a/tests/twisted/test-resolver.c
+++ b/tests/twisted/test-resolver.c
@@ -123,9 +123,10 @@ lookup_service_async (GResolver *resolver,
 
   if (addr == NULL)
     {
-      GResolver *real = G_RESOLVER (tr->real_resolver);
-      addr = G_RESOLVER_GET_CLASS (real)->
-        lookup_service (real, rr, cancellable, &error);
+      g_set_error (&error,
+        G_RESOLVER_ERROR,
+        G_RESOLVER_ERROR_NOT_FOUND,
+        "No fake SRV record registered");
     }
 #ifdef DEBUG_FAKEDNS
   else
@@ -178,8 +179,10 @@ lookup_by_name_async (GResolver *resolver,
 
   if (addr == NULL)
     {
-      GResolver *real = G_RESOLVER (tr->real_resolver);
-      addr = g_resolver_lookup_by_name (real, hostname, cancellable, &error);
+      g_set_error (&error,
+        G_RESOLVER_ERROR,
+        G_RESOLVER_ERROR_NOT_FOUND,
+        "No fake hostname record registered");
     }
 #ifdef DEBUG_FAKEDNS
   else
-- 
1.5.6.5