[libgdata/offline-testing] Revert "tests: BROKEN add proxy resolver support"



commit 1df7a2dcb994aae00ad0c4aebc66be3bd54b4a3c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Jul 6 18:19:32 2013 +0100

    Revert "tests: BROKEN add proxy resolver support"
    
    This reverts commit e408a03d749a524be345f51ef9de75aa2bac29ab.

 gdata/tests/Makefile.am   |    2 -
 gdata/tests/common.c      |   13 -----
 gdata/tests/mock-proxy.c  |  129 ---------------------------------------------
 gdata/tests/mock-proxy.h  |   50 -----------------
 gdata/tests/mock-server.c |    5 --
 5 files changed, 0 insertions(+), 199 deletions(-)
---
diff --git a/gdata/tests/Makefile.am b/gdata/tests/Makefile.am
index f431014..986c3a2 100644
--- a/gdata/tests/Makefile.am
+++ b/gdata/tests/Makefile.am
@@ -23,8 +23,6 @@ noinst_PROGRAMS = $(TEST_PROGS)
 TEST_SRCS = \
        common.c \
        common.h \
-       mock-proxy.c \
-       mock-proxy.h \
        mock-resolver.c \
        mock-resolver.h \
        mock-server.c \
diff --git a/gdata/tests/common.c b/gdata/tests/common.c
index fe8f297..72306d1 100644
--- a/gdata/tests/common.c
+++ b/gdata/tests/common.c
@@ -25,7 +25,6 @@
 #include <libxml/xmlsave.h>
 
 #include "common.h"
-#include "mock-proxy.h"
 #include "mock-server.h"
 
 /* %TRUE if there's no Internet connection, so we should only run local tests */
@@ -56,23 +55,11 @@ void
 gdata_test_init (int argc, char **argv)
 {
        gint i;
-       GList *extensions, *l;
-       GIOExtensionPoint *extension_point;
 
 #if !GLIB_CHECK_VERSION (2, 35, 0)
        g_type_init ();
 #endif
 
-       _gdata_mock_proxy_resolver_get_type (); /* TODO */
-
-       g_setenv ("GIO_USE_PROXY_RESOLVER", "gdata-mock", TRUE);
-       extension_point = g_io_extension_point_lookup (G_PROXY_RESOLVER_EXTENSION_POINT_NAME);
-       g_assert (extension_point != NULL);
-       extensions = g_io_extension_point_get_extensions (extension_point);
-       for (l = extensions; l != NULL; l = l->next) {
-               g_message ("Extension: %s, %i", g_io_extension_get_name (l->data), 
g_io_extension_get_priority (l->data));
-       }
-
        /* Parse the custom options */
        for (i = 1; i < argc; i++) {
                if (strcmp ("--no-internet", argv[i]) == 0 || strcmp ("-n", argv[i]) == 0) {
diff --git a/gdata/tests/mock-server.c b/gdata/tests/mock-server.c
index ed34b67..e702f4b 100644
--- a/gdata/tests/mock-server.c
+++ b/gdata/tests/mock-server.c
@@ -845,7 +845,6 @@ gdata_mock_server_run (GDataMockServer *self)
        struct sockaddr_in sock;
        SoupAddress *addr;
        GMainContext *thread_context;
-       GProxyResolver *proxy;
 
        g_return_if_fail (GDATA_IS_MOCK_SERVER (self));
        g_return_if_fail (priv->resolver == NULL);
@@ -860,10 +859,6 @@ gdata_mock_server_run (GDataMockServer *self)
        addr = soup_address_new_from_sockaddr ((struct sockaddr *) &sock, sizeof (sock));
        g_assert (addr != NULL);
 
-proxy = g_proxy_resolver_get_default ();
-g_message ("Resolver %p: %s", proxy, (proxy != NULL) ? G_OBJECT_TYPE_NAME (proxy) : "null");
-
-
        /* Set up the resolver, adding TODO */
        priv->resolver = gdata_mock_resolver_new ();
        gdata_mock_resolver_add_A (priv->resolver, "www.google.com", "127.0.0.1"); /* TODO: get IP from soup 
*/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]