tmp fedora geoipwip/fedora-geoip

2 files changed, 32 insertions, 4 deletions

diff --git a/src/gclue-locator.c b/src/gclue-locator.c
index ccb30d6..f7e99d9 100644
--- a/src/gclue-locator.c
+++ b/src/gclue-locator.c
@@ -247,7 +247,7 @@ gclue_locator_start (GClueLocator        *locator,
 
         locator->priv->ipclient = gclue_ipclient_new ();
         g_object_set (locator->priv->ipclient,
-                      "server", "http://freegeoip.net/json/",
+                      "server", "https://geoip.fedoraproject.org/city",
                       "compatibility-mode", TRUE,
                       NULL);
 
diff --git a/src/geoip-server/test-geoipformat.c b/src/geoip-server/test-geoipformat.c
index 7a40adc..b7d8375 100644
--- a/src/geoip-server/test-geoipformat.c
+++ b/src/geoip-server/test-geoipformat.c
@@ -42,8 +42,8 @@ test_response_data (gconstpointer data)
         object = json_node_get_object (node);
         g_assert (object != NULL);
 
-        g_assert (json_object_has_member (object, "ip"));
-        g_assert (strcmp (json_object_get_string_member (object, "ip"), "213.243.180.91") == 0);
+        //g_assert (json_object_has_member (object, "ip"));
+        //g_assert (strcmp (json_object_get_string_member (object, "ip"), "213.243.180.91") == 0);
 
         g_assert (json_object_has_member (object, "latitude"));
         latitude = json_object_get_double_member (object, "latitude");
@@ -90,6 +90,28 @@ get_freegeoip_response (void)
 }
 
 static char *
+get_fedora_geoip_response (void)
+{
+        GFile *file;
+        char *contents = NULL;
+        char *path;
+        GError *error = NULL;
+
+        path = g_build_filename(TEST_SRCDIR, "fedora-geoip-results.json", NULL);
+        g_assert (path != NULL);
+        file = g_file_new_for_path(path);
+        if (!g_file_load_contents (file, NULL, &contents, NULL, NULL, &error)) {
+                g_warning ("Failed to load file '%s': %s", path, error->message);
+                g_error_free (error);
+                g_assert_not_reached ();
+        }
+
+        g_free (path);
+
+        return contents;
+}
+
+static char *
 get_our_server_response (const char *query)
 {
         char *response;
@@ -138,7 +160,7 @@ get_our_server_response (const char *query)
 int
 main (int argc, char **argv)
 {
-        char *our_response, *freegeoip_response;
+        char *our_response, *freegeoip_response, *fedora_geoip_response;
         int ret;
 
 #if (!GLIB_CHECK_VERSION (2, 36, 0))
@@ -157,8 +179,14 @@ main (int argc, char **argv)
                               freegeoip_response,
                               test_response_data);
 
+        fedora_geoip_response = get_fedora_geoip_response ();
+        g_test_add_data_func ("/geoip/fedora-geoip-format",
+                              fedora_geoip_response,
+                              test_response_data);
+
         ret = g_test_run ();
         g_free (freegeoip_response);
+        g_free (fedora_geoip_response);
         g_free (our_response);
 
         return ret;