mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
6acdc42e04
nmtstc_client_new() exists to test creating a GInitiable/GAsyncInitiable in different GMainContext combinations. This is not only useful for NMClient but will also be useful for NMSecretAgentOld. Add nmtstc_context_object_new() to allow for that. Also, allow passing parameters when creating the object. The resulting nmtstc_context_object_new() is relatively complex. But this is only testing code, that aims to construct the respective GObject instance in various manners (randomly using the sync or async initialization). It is complex, but delivers at testing various code paths of the underlying code. The API that it provides however is simple. Also drop _nmtstc_client_new_extra_context() to create the instance with a different context. For one, this requires that the internal context is integrated as long as the context-busy-watcher exists. That was not handled correctly. Also, creating a NMClient instance with a different context than the current thread default at construct time has implications to the test later. The tests don't want this variant, and don't handle them properly. So drop this.
85 lines
3.2 KiB
C
85 lines
3.2 KiB
C
// SPDX-License-Identifier: LGPL-2.1+
|
|
/*
|
|
* Copyright (C) 2014 - 2015 Red Hat, Inc.
|
|
*/
|
|
|
|
#include "NetworkManager.h"
|
|
|
|
#include "nm-utils/nm-test-utils.h"
|
|
|
|
typedef struct {
|
|
GDBusConnection *bus;
|
|
GDBusProxy *proxy;
|
|
GPid pid;
|
|
int keepalive_fd;
|
|
} NMTstcServiceInfo;
|
|
|
|
NMTstcServiceInfo *nmtstc_service_init (void);
|
|
void nmtstc_service_cleanup (NMTstcServiceInfo *info);
|
|
NMTstcServiceInfo *nmtstc_service_available (NMTstcServiceInfo *info);
|
|
|
|
static inline void _nmtstc_auto_service_cleanup (NMTstcServiceInfo **info)
|
|
{
|
|
nmtstc_service_cleanup (g_steal_pointer (info));
|
|
}
|
|
#define nmtstc_auto_service_cleanup nm_auto(_nmtstc_auto_service_cleanup)
|
|
|
|
#define NMTSTC_SERVICE_INFO_SETUP(sinfo) \
|
|
NM_PRAGMA_WARNING_DISABLE ("-Wunused-variable") \
|
|
nmtstc_auto_service_cleanup NMTstcServiceInfo *sinfo = ({ \
|
|
NMTstcServiceInfo *_sinfo; \
|
|
\
|
|
_sinfo = nmtstc_service_init (); \
|
|
if (!nmtstc_service_available (_sinfo)) \
|
|
return; \
|
|
_sinfo; \
|
|
}); \
|
|
NM_PRAGMA_WARNING_REENABLE
|
|
|
|
NMDevice *nmtstc_service_add_device (NMTstcServiceInfo *info,
|
|
NMClient *client,
|
|
const char *method,
|
|
const char *ifname);
|
|
|
|
NMDevice * nmtstc_service_add_wired_device (NMTstcServiceInfo *sinfo,
|
|
NMClient *client,
|
|
const char *ifname,
|
|
const char *hwaddr,
|
|
const char **subchannels);
|
|
|
|
void nmtstc_service_add_connection (NMTstcServiceInfo *sinfo,
|
|
NMConnection *connection,
|
|
gboolean verify_connection,
|
|
char **out_path);
|
|
|
|
void nmtstc_service_add_connection_variant (NMTstcServiceInfo *sinfo,
|
|
GVariant *connection,
|
|
gboolean verify_connection,
|
|
char **out_path);
|
|
|
|
void nmtstc_service_update_connection (NMTstcServiceInfo *sinfo,
|
|
const char *path,
|
|
NMConnection *connection,
|
|
gboolean verify_connection);
|
|
|
|
void nmtstc_service_update_connection_variant (NMTstcServiceInfo *sinfo,
|
|
const char *path,
|
|
GVariant *connection,
|
|
gboolean verify_connection);
|
|
|
|
gpointer nmtstc_context_object_new_valist (GType gtype,
|
|
gboolean allow_iterate_main_context,
|
|
const char *first_property_name,
|
|
va_list var_args);
|
|
|
|
gpointer nmtstc_context_object_new (GType gtype,
|
|
gboolean allow_iterate_main_context,
|
|
const char *first_property_name,
|
|
...);
|
|
|
|
static inline NMClient *
|
|
nmtstc_client_new (gboolean allow_iterate_main_context)
|
|
{
|
|
return nmtstc_context_object_new (NM_TYPE_CLIENT, allow_iterate_main_context, NULL);
|
|
}
|