d595f7843e
This commit begins creating the new "libnm", which will replace libnm-util and libnm-glib. The main reason for the libnm-util/libnm-glib split is that the daemon needs to link to libnm-util (to get NMSettings, NMConnection, etc), but can't link to libnm-glib (because it uses many of the same type names as the NetworkManager daemon. eg, NMDevice). So the daemon links to only libnm-util, but basically all clients link to both. With libnm, there will be only a single client-visible library, and NetworkManager will internally link against a private "libnm-core" containing the parts that used to be in libnm-util. (The "libnm-core" parts still need to be in their own directory so that the daemon can see those header files without also seeing the ones in libnm/ that conflict with its own headers.) [This commit just copies the source code from libnm-util/ to libnm-core/, and libnm-glib/ to libnm/: mkdir -p libnm-core/tests/ mkdir -p libnm/tests/ cp libnm-util/*.[ch] libnm-util/nm-version.h.in libnm-core/ rm -f libnm-core/nm-version.h libnm-core/nm-setting-template.[ch] libnm-core/nm-utils-enum-types.[ch] cp libnm-util/tests/*.[ch] libnm-core/tests/ cp libnm-glib/*.[ch] libnm/ rm -f libnm/libnm_glib.[ch] libnm/libnm-glib-test.c libnm/nm-glib-enum-types.[ch] cp libnm-glib/tests/*.[ch] libnm/tests/ ]
120 lines
3.7 KiB
C
120 lines
3.7 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2010 - 2014 Red Hat, Inc.
|
|
*
|
|
*/
|
|
|
|
#include <dbus/dbus.h>
|
|
#include <glib.h>
|
|
#include <string.h>
|
|
|
|
#include "NetworkManager.h"
|
|
|
|
#include "common.h"
|
|
|
|
static gboolean
|
|
name_exists (GDBusConnection *c, const char *name)
|
|
{
|
|
GVariant *reply;
|
|
gboolean exists = FALSE;
|
|
|
|
reply = g_dbus_connection_call_sync (c,
|
|
DBUS_SERVICE_DBUS,
|
|
DBUS_PATH_DBUS,
|
|
DBUS_INTERFACE_DBUS,
|
|
"GetNameOwner",
|
|
g_variant_new ("(s)", name),
|
|
NULL,
|
|
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
|
-1,
|
|
NULL,
|
|
NULL);
|
|
if (reply != NULL) {
|
|
exists = TRUE;
|
|
g_variant_unref (reply);
|
|
}
|
|
|
|
return exists;
|
|
}
|
|
|
|
NMTestServiceInfo *
|
|
nm_test_service_init (void)
|
|
{
|
|
NMTestServiceInfo *info;
|
|
const char *args[2] = { TEST_NM_SERVICE, NULL };
|
|
GError *error = NULL;
|
|
int i;
|
|
|
|
info = g_malloc0 (sizeof (*info));
|
|
|
|
info->bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
|
|
g_assert_no_error (error);
|
|
|
|
/* Spawn the test service. info->keepalive_fd will be a pipe to the service's
|
|
* stdin; if it closes, the service will exit immediately. We use this to
|
|
* make sure the service exits if the test program crashes.
|
|
*/
|
|
g_spawn_async_with_pipes (NULL, (char **) args, NULL, 0, NULL, NULL,
|
|
&info->pid, &info->keepalive_fd, NULL, NULL, &error);
|
|
g_assert_no_error (error);
|
|
|
|
/* Wait until the service is registered on the bus */
|
|
for (i = 100; i > 0; i--) {
|
|
if (name_exists (info->bus, "org.freedesktop.NetworkManager"))
|
|
break;
|
|
g_usleep (G_USEC_PER_SEC / 50);
|
|
}
|
|
g_assert (i > 0);
|
|
|
|
/* Grab a proxy to our fake NM service to trigger tests */
|
|
info->proxy = g_dbus_proxy_new_sync (info->bus,
|
|
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
|
|
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
|
|
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
|
|
NULL,
|
|
NM_DBUS_SERVICE,
|
|
NM_DBUS_PATH,
|
|
"org.freedesktop.NetworkManager.LibnmGlibTest",
|
|
NULL, &error);
|
|
g_assert_no_error (error);
|
|
|
|
return info;
|
|
}
|
|
|
|
void
|
|
nm_test_service_cleanup (NMTestServiceInfo *info)
|
|
{
|
|
int i;
|
|
|
|
g_object_unref (info->proxy);
|
|
kill (info->pid, SIGTERM);
|
|
|
|
/* Wait until the bus notices the service is gone */
|
|
for (i = 100; i > 0; i--) {
|
|
if (!name_exists (info->bus, "org.freedesktop.NetworkManager"))
|
|
break;
|
|
g_usleep (G_USEC_PER_SEC / 50);
|
|
}
|
|
g_assert (i > 0);
|
|
|
|
g_object_unref (info->bus);
|
|
close (info->keepalive_fd);
|
|
|
|
memset (info, 0, sizeof (*info));
|
|
g_free (info);
|
|
}
|