summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-08-12 12:09:06 +0200
committerThomas Haller <thaller@redhat.com>2015-08-12 12:14:19 +0200
commit3ae6f9d793d8af24d168344ea0e3fb2cef47af54 (patch)
treef6ee7362bda4f18e3d6c944df29c72a7886a00ae
parent286455bfda19048135f87a619310ccb4fb52956b (diff)
downloadNetworkManager-3ae6f9d793d8af24d168344ea0e3fb2cef47af54.tar.gz
config/tests: fix tests after introducing NMExportedObject class
The config-tests contain a NMTestDevice which derives from NMDevice. However, for testing, it just skips the constructor and destructor of NMDevice. This caused also the destructors of NMExportedObject to be skipped and thus valgrind complained about leaked memory. Fixes: 6fcc1deee0a9549d753813f9406ea1d74a2a8e8c
-rw-r--r--src/tests/config/nm-test-device.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c
index b5f65ded6c..681f496603 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/tests/config/nm-test-device.c
@@ -26,10 +26,10 @@
#include "nm-device-private.h"
#include "nm-utils.h"
-static GObjectClass *g_object_class;
-
G_DEFINE_TYPE (NMTestDevice, nm_test_device, NM_TYPE_DEVICE)
+#define PARENT_CLASS (G_OBJECT_CLASS (g_type_class_peek_parent (nm_test_device_parent_class)))
+
static void
nm_test_device_init (NMTestDevice *self)
{
@@ -44,21 +44,21 @@ constructor (GType type,
guint n_construct_params,
GObjectConstructParam *construct_params)
{
- return g_object_class->constructor (type,
- n_construct_params,
- construct_params);
+ return PARENT_CLASS->constructor (type,
+ n_construct_params,
+ construct_params);
}
static void
constructed (GObject *object)
{
- g_object_class->constructed (object);
+ PARENT_CLASS->constructed (object);
}
static void
dispose (GObject *object)
{
- g_object_class->dispose (object);
+ PARENT_CLASS->dispose (object);
}
static NMDeviceCapabilities
@@ -73,8 +73,6 @@ nm_test_device_class_init (NMTestDeviceClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
- g_object_class = g_type_class_peek (G_TYPE_OBJECT);
-
object_class->constructor = constructor;
object_class->constructed = constructed;
object_class->dispose = dispose;