diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
| commit | c2de0d98ba39e0a1a970d066fd19be786092f376 (patch) | |
| tree | 3838363c06a6019db6cf1f882ea34ebded63c38b /libnm-util | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'libnm-util')
42 files changed, 289 insertions, 581 deletions
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 8101082b..c4105fd4 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -153,6 +153,9 @@ typedef enum { * @NM_DEVICE_TYPE_TEAM: a team master interface * @NM_DEVICE_TYPE_TUN: a TUN/TAP interface * @NM_DEVICE_TYPE_IP_TUNNEL: an IP tunnel interface + * @NM_DEVICE_TYPE_MACVLAN: a MACVLAN interface + * @NM_DEVICE_TYPE_VXLAN: a VXLAN interface + * @NM_DEVICE_TYPE_VETH: a VETH interface * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. @@ -178,6 +181,9 @@ typedef enum { NM_DEVICE_TYPE_TEAM = 15, NM_DEVICE_TYPE_TUN = 16, NM_DEVICE_TYPE_IP_TUNNEL = 17, + NM_DEVICE_TYPE_MACVLAN = 18, + NM_DEVICE_TYPE_VXLAN = 19, + NM_DEVICE_TYPE_VETH = 20, } NMDeviceType; /** diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 757fdbe0..7fdf0f72 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <strings.h> #include <unistd.h> #include <stdlib.h> -#include "nm-default.h" #include "crypto.h" GQuark diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index 4e3e4e7c..8604c5c3 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2015 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h> #include <gnutls/x509.h> #include <gnutls/pkcs12.h> -#include "nm-default.h" #include "crypto.h" #define SALT_LEN 8 diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index b71806dd..4e60d2e9 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -21,7 +21,7 @@ * Copyright 2007 - 2009 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <prinit.h> #include <nss.h> @@ -33,7 +33,6 @@ #include <ciferfam.h> #include <p12plcy.h> -#include "nm-default.h" #include "crypto.h" static gboolean initialized = FALSE; diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index ea1492b7..ea791c51 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -20,11 +20,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus-glib.h> #include <string.h> -#include "nm-default.h" + #include "nm-connection.h" #include "nm-utils.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 7f242acf..0bb32b7f 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -20,9 +20,8 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-gvaluearray-compat.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 30febf9c..f476b248 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -20,19 +20,19 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "nm-setting-8021x.h" #include <string.h> #include <dbus/dbus-glib.h> -#include "nm-setting-8021x.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" #include "nm-dbus-glib-types.h" #include "crypto.h" #include "nm-utils-private.h" #include "nm-setting-private.h" -#include "nm-macros-internal.h" /** * SECTION:nm-setting-8021x @@ -431,16 +431,16 @@ get_cert_scheme (GByteArray *array) return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN; /* interpret the blob as PATH if it starts with "file://". */ - if ( array->len >= STRLEN (SCHEME_PATH) - && !memcmp (array->data, SCHEME_PATH, STRLEN (SCHEME_PATH))) { + if ( array->len >= NM_STRLEN (SCHEME_PATH) + && !memcmp (array->data, SCHEME_PATH, NM_STRLEN (SCHEME_PATH))) { /* But it must also be NUL terminated, contain at least * one non-NUL character, and contain only one trailing NUL * chracter. * And ensure it's UTF-8 valid too so we can pass it through * D-Bus and stuff like that. */ - if ( array->len > STRLEN (SCHEME_PATH) + 1 + if ( array->len > NM_STRLEN (SCHEME_PATH) + 1 && array->data[array->len - 1] == '\0' - && g_utf8_validate ((const char *) &array->data[STRLEN (SCHEME_PATH)], array->len - (STRLEN (SCHEME_PATH) + 1), NULL)) + && g_utf8_validate ((const char *) &array->data[NM_STRLEN (SCHEME_PATH)], array->len - (NM_STRLEN (SCHEME_PATH) + 1), NULL)) return NM_SETTING_802_1X_CK_SCHEME_PATH; return NM_SETTING_802_1X_CK_SCHEME_UNKNOWN; } diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index 55d04ce1..5c177570 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 76bf2831..db0b3e92 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index c6e860bd..29bf6404 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index 9da21925..3d11e73c 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -19,7 +19,7 @@ * Copyright 2012 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 1e475d30..833728b9 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index 10981652..794945f1 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index abbe99ba..16c858dc 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index da3febaa..7888a711 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -19,7 +19,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> diff --git a/libnm-util/nm-setting-generic.c b/libnm-util/nm-setting-generic.c index e32ae497..39134e8b 100644 --- a/libnm-util/nm-setting-generic.c +++ b/libnm-util/nm-setting-generic.c @@ -19,7 +19,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-generic.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index bc9f31bc..fd11ce67 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index 95fa0c69..c9fa8ec9 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <dbus/dbus-glib.h> diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index efc226b3..6018af06 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -20,12 +20,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> -#include "nm-default.h" #include "nm-setting-ip4-config.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 2ddce6c1..ac164588 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -19,12 +19,11 @@ * Copyright 2007 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> -#include "nm-default.h" #include "nm-setting-ip6-config.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index 8d812869..7785d860 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -20,7 +20,7 @@ * Copyright 2009 One Laptop per Child */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index 06f220fe..d574bcea 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-setting-ppp.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index 5747d306..5b729c85 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index c60cffb2..8a4b079d 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -20,11 +20,10 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-serial.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c index 7e17d5e3..5fa511d9 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -18,7 +18,7 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <ctype.h> diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index 07531503..f5dcdc94 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -18,7 +18,7 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 310a7da8..32ad9394 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -19,7 +19,7 @@ * Copyright 2011 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <string.h> @@ -593,6 +593,16 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) return FALSE; } + if (priv->id >= 4095) { + g_set_error (error, + NM_SETTING_VLAN_ERROR, + NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, + _("the vlan id must be in range 0-4094 but is %u"), + priv->id); + g_prefix_error (error, "%s.%s: ", NM_SETTING_VLAN_SETTING_NAME, NM_SETTING_VLAN_ID); + return FALSE; + } + /* If interface_name is specified, it must be a valid interface name. We * don't check that it matches parent and/or id, because we allow * renaming vlans to arbitrary names. diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 95f08adf..f0d7ecf5 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <errno.h> diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 7581f2f2..60beb912 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -20,7 +20,7 @@ * Copyright 2009 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 5233fc53..0c3371e7 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 719dfaa6..8749cdfa 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib.h> diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 2720f4af..acb1d457 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <net/ethernet.h> diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 372b06b5..add3ad97 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -20,7 +20,7 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 1659a1a3..7c9def1d 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -19,7 +19,9 @@ * Copyright 2005 - 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" + +#include "nm-utils.h" #include <string.h> #include <stdlib.h> @@ -29,17 +31,14 @@ #include <libintl.h> #include <gmodule.h> -#include "nm-default.h" #include "nm-gvaluearray-compat.h" -#include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" #include "nm-setting-private.h" #include "crypto.h" -#include "nm-macros-internal.h" /* Embed the commit id in the build binary */ -static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; +static const char *const __nm_git_sha = NM_STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : ""; /** * SECTION:nm-utils diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c index fd4aaf60..2d31f129 100644 --- a/libnm-util/nm-value-transforms.c +++ b/libnm-util/nm-value-transforms.c @@ -19,11 +19,10 @@ * Copyright 2005 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-gvaluearray-compat.h" #include "nm-utils.h" #include "nm-utils-private.h" diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index 5a8c4eb0..a1c7648f 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "crypto.h" #include "nm-utils.h" @@ -103,13 +102,8 @@ test_cert (gconstpointer test_data) path = g_build_filename (TEST_CERT_DIR, (const char *) test_data, NULL); array = crypto_load_and_verify_certificate (path, &format, &error); - ASSERT (array != NULL, "cert", - "couldn't read certificate file '%s': %d %s", - path, error->code, error->message); - - ASSERT (format == NM_CRYPTO_FILE_FORMAT_X509, "cert", - "%s: unexpected certificate format (expected %d, got %d)", - path, NM_CRYPTO_FILE_FORMAT_X509, format); + nmtst_assert_success (array != NULL, error); + g_assert (format == NM_CRYPTO_FILE_FORMAT_X509); g_byte_array_free (array, TRUE); } @@ -143,42 +137,22 @@ test_load_private_key (const char *path, array = crypto_decrypt_private_key (path, password, &key_type, &error); if (expect_fail) { - ASSERT (array == NULL, desc, - "unexpected success reading private key file '%s' with " - "invalid password", - path); - - ASSERT (key_type != NM_CRYPTO_KEY_TYPE_UNKNOWN, desc, - "unexpected failure determining private key file '%s' " - "type with invalid password (expected %d, got %d)", - path, NM_CRYPTO_KEY_TYPE_UNKNOWN, key_type); + g_assert (!array); + g_assert ((password && error) || (!password && !error)); + g_assert (key_type != NM_CRYPTO_KEY_TYPE_UNKNOWN); g_clear_error (&error); return; } - ASSERT (array != NULL, desc, - "couldn't read private key file '%s': %d %s", - path, error->code, error->message); - - ASSERT (key_type == NM_CRYPTO_KEY_TYPE_RSA, desc, - "%s: unexpected private key type (expected %d, got %d)", - path, NM_CRYPTO_KEY_TYPE_RSA, key_type); + g_assert (array); + g_assert (key_type == NM_CRYPTO_KEY_TYPE_RSA); if (decrypted_path) { /* Compare the crypto decrypted key against a known-good decryption */ decrypted = file_to_byte_array (decrypted_path); - ASSERT (decrypted != NULL, desc, - "couldn't read decrypted private key file '%s': %d %s", - decrypted_path, error->code, error->message); - - ASSERT (decrypted->len > 0, desc, "decrypted key file invalid (size 0)"); - - ASSERT (decrypted->len == array->len, - desc, "decrypted key file (%d) and decrypted key data (%d) lengths don't match", - decrypted->len, array->len); - - ASSERT (memcmp (decrypted->data, array->data, array->len) == 0, - desc, "decrypted key file and decrypted key data don't match"); + g_assert (decrypted); + g_assert_cmpint (decrypted->len, >, 0); + g_assert_cmpmem (decrypted->data, decrypted->len, array->data, array->len); g_byte_array_free (decrypted, TRUE); } @@ -197,17 +171,10 @@ test_load_pkcs12 (const char *path, GError *error = NULL; format = crypto_verify_private_key (path, password, &error); - if (expect_fail) { - ASSERT (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN, desc, - "unexpected success reading PKCS#12 private key file " - "'%s' with invalid password", - path); - } else { - ASSERT (format == NM_CRYPTO_FILE_FORMAT_PKCS12, desc, - "%s: unexpected PKCS#12 private key file format (expected %d, got " - "%d): %d %s", - path, NM_CRYPTO_FILE_FORMAT_PKCS12, format, error->code, error->message); - } + if (expect_fail) + g_assert (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN); + else + g_assert (format == NM_CRYPTO_FILE_FORMAT_PKCS12); g_clear_error (&error); } @@ -219,10 +186,7 @@ test_load_pkcs12_no_password (const char *path, const char *desc) /* We should still get a valid returned crypto file format */ format = crypto_verify_private_key (path, NULL, &error); - ASSERT (format == NM_CRYPTO_FILE_FORMAT_PKCS12, desc, - "%s: unexpected PKCS#12 private key file format (expected %d, got " - "%d): %d %s", - path, NM_CRYPTO_FILE_FORMAT_PKCS12, format, error->code, error->message); + g_assert (format == NM_CRYPTO_FILE_FORMAT_PKCS12); } static void @@ -231,13 +195,10 @@ test_is_pkcs12 (const char *path, gboolean expect_fail, const char *desc) gboolean is_pkcs12; is_pkcs12 = crypto_is_pkcs12_file (path, NULL); - if (expect_fail) { - ASSERT (is_pkcs12 == FALSE, desc, - "unexpected success reading non-PKCS#12 file '%s'", - path); - } else { - ASSERT (is_pkcs12 == TRUE, desc, "couldn't read PKCS#12 file '%s'", path); - } + if (expect_fail) + g_assert (!is_pkcs12); + else + g_assert (is_pkcs12); } static void @@ -250,17 +211,10 @@ test_load_pkcs8 (const char *path, GError *error = NULL; format = crypto_verify_private_key (path, password, &error); - if (expect_fail) { - ASSERT (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN, desc, - "unexpected success reading PKCS#8 private key file " - "'%s' with invalid password", - path); - } else { - ASSERT (format == NM_CRYPTO_FILE_FORMAT_RAW_KEY, desc, - "%s: unexpected PKCS#8 private key file format (expected %d, got " - "%d): %d %s", - path, NM_CRYPTO_FILE_FORMAT_RAW_KEY, format, error->code, error->message); - } + if (expect_fail) + g_assert (format == NM_CRYPTO_FILE_FORMAT_UNKNOWN); + else + g_assert (format == NM_CRYPTO_FILE_FORMAT_RAW_KEY); } static gboolean @@ -295,42 +249,27 @@ test_encrypt_private_key (const char *path, GError *error = NULL; array = crypto_decrypt_private_key (path, password, &key_type, &error); - ASSERT (array != NULL, desc, - "couldn't read private key file '%s': %d %s", - path, error->code, error->message); - - ASSERT (key_type == NM_CRYPTO_KEY_TYPE_RSA, desc, - "%s: unexpected private key type (expected %d, got %d)", - path, NM_CRYPTO_KEY_TYPE_RSA, key_type); + g_assert (array); + g_assert_no_error (error); + g_assert (key_type == NM_CRYPTO_KEY_TYPE_RSA); /* Now re-encrypt the private key */ if (is_cipher_aes (path)) encrypted = nm_utils_rsa_key_encrypt_aes (array, password, NULL, &error); else encrypted = nm_utils_rsa_key_encrypt (array, password, NULL, &error); - ASSERT (encrypted != NULL, desc, - "couldn't re-encrypt private key file '%s': %d %s", - path, error->code, error->message); + g_assert (encrypted); + g_assert_no_error (error); /* Then re-decrypt the private key */ key_type = NM_CRYPTO_KEY_TYPE_UNKNOWN; re_decrypted = crypto_decrypt_private_key_data (encrypted, password, &key_type, &error); - ASSERT (re_decrypted != NULL, desc, - "couldn't read private key file '%s': %d %s", - path, error->code, error->message); - - ASSERT (key_type == NM_CRYPTO_KEY_TYPE_RSA, desc, - "%s: unexpected private key type (expected %d, got %d)", - path, NM_CRYPTO_KEY_TYPE_RSA, key_type); + g_assert (re_decrypted); + g_assert_no_error (error); + g_assert (key_type == NM_CRYPTO_KEY_TYPE_RSA); /* Compare the original decrypted key with the re-decrypted key */ - ASSERT (array->len == re_decrypted->len, desc, - "%s: unexpected re-decrypted private key length (expected %d, got %d)", - path, array->len, re_decrypted->len); - - ASSERT (!memcmp (array->data, re_decrypted->data, array->len), desc, - "%s: unexpected private key data", - path); + g_assert_cmpmem (array->data, array->len, re_decrypted->data, re_decrypted->len); g_byte_array_free (re_decrypted, TRUE); g_byte_array_free (encrypted, TRUE); @@ -345,8 +284,7 @@ test_key (gconstpointer test_data) parts = g_strsplit ((const char *) test_data, ", ", -1); len = g_strv_length (parts); - ASSERT (len == 2 || len == 3, "test-crypto", - "wrong number of arguments (<key file>, <password>, [<decrypted key file>])"); + g_assert (len == 2 || len == 3); path = g_build_filename (TEST_CERT_DIR, parts[0], NULL); password = parts[1]; @@ -369,8 +307,7 @@ test_pkcs12 (gconstpointer test_data) char **parts, *path, *password; parts = g_strsplit ((const char *) test_data, ", ", -1); - ASSERT (g_strv_length (parts) == 2, "test-crypto", - "wrong number of arguments (<file>, <password>)"); + g_assert_cmpint (g_strv_length (parts), ==, 2); path = g_build_filename (TEST_CERT_DIR, parts[0], NULL); password = parts[1]; @@ -390,8 +327,7 @@ test_pkcs8 (gconstpointer test_data) char **parts, *path, *password; parts = g_strsplit ((const char *) test_data, ", ", -1); - ASSERT (g_strv_length (parts) == 2, "test-crypto", - "wrong number of arguments (<file>, <password>)"); + g_assert_cmpint (g_strv_length (parts), ==, 2); path = g_build_filename (TEST_CERT_DIR, parts[0], NULL); password = parts[1]; @@ -414,11 +350,13 @@ int main (int argc, char **argv) { GError *error = NULL; + gboolean success; nmtst_init (&argc, &argv, TRUE); - if (!crypto_init (&error)) - FAIL ("crypto-init", "failed to initialize crypto: %s", error->message); + success = crypto_init (&error); + g_assert_no_error (error); + g_assert (success); g_test_add_data_func ("/libnm/crypto/cert/pem", "test_ca_cert.pem", diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index f35819e7..9299bd5b 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -19,7 +19,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus-glib.h> #include <string.h> @@ -28,8 +28,7 @@ #include <sys/wait.h> #include <sys/resource.h> -#include <nm-utils.h> -#include "nm-default.h" +#include "nm-utils.h" #include "nm-gvaluearray-compat.h" #include "nm-setting-private.h" @@ -53,42 +52,33 @@ static void vpn_check_func (const char *key, const char *value, gpointer user_data) { - const char *test = user_data; - if (!strcmp (key, "foobar1")) { - ASSERT (strcmp (value, "blahblah1") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah1"); return; } if (!strcmp (key, "foobar2")) { - ASSERT (strcmp (value, "blahblah2") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah2"); return; } if (!strcmp (key, "foobar3")) { - ASSERT (strcmp (value, "blahblah3") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah3"); return; } if (!strcmp (key, "foobar4")) { - ASSERT (strcmp (value, "blahblah4") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah4"); return; } - ASSERT (FALSE, test, "unexpected vpn item '%s'", key); + g_assert_not_reached (); } static void vpn_check_empty_func (const char *key, const char *value, gpointer user_data) { - const char *test = user_data; - - /* We don't expect any values */ - ASSERT (FALSE, test, "unexpected vpn item '%s'", key); + g_assert_not_reached (); } static void @@ -97,9 +87,7 @@ test_setting_vpn_items (void) NMSettingVPN *s_vpn; s_vpn = (NMSettingVPN *) nm_setting_vpn_new (); - ASSERT (s_vpn != NULL, - "vpn-items", - "error creating vpn setting"); + g_assert (s_vpn); nm_setting_vpn_add_data_item (s_vpn, "foobar1", "blahblah1"); nm_setting_vpn_add_data_item (s_vpn, "foobar2", "blahblah2"); @@ -107,7 +95,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_data_item (s_vpn, "foobar4", "blahblah4"); /* Ensure that added values are all present */ - nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_func, "vpn-data"); + nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_func, NULL); nm_setting_vpn_remove_data_item (s_vpn, "foobar1"); nm_setting_vpn_remove_data_item (s_vpn, "foobar2"); nm_setting_vpn_remove_data_item (s_vpn, "foobar3"); @@ -119,7 +107,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_secret (s_vpn, "foobar4", "blahblah4"); /* Ensure that added values are all present */ - nm_setting_vpn_foreach_secret (s_vpn, vpn_check_func, "vpn-secrets"); + nm_setting_vpn_foreach_secret (s_vpn, vpn_check_func, NULL); nm_setting_vpn_remove_secret (s_vpn, "foobar1"); nm_setting_vpn_remove_secret (s_vpn, "foobar2"); nm_setting_vpn_remove_secret (s_vpn, "foobar3"); @@ -150,7 +138,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_data_item (s_vpn, "", "blahblah1"); g_test_assert_expected_messages (); - nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, "vpn-data-empty"); + nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, NULL); /* Try to add some blank secrets and make sure they are rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*key != NULL*"); @@ -177,7 +165,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_secret (s_vpn, "", "blahblah1"); g_test_assert_expected_messages (); - nm_setting_vpn_foreach_secret (s_vpn, vpn_check_empty_func, "vpn-secrets-empty"); + nm_setting_vpn_foreach_secret (s_vpn, vpn_check_empty_func, NULL); g_object_unref (s_vpn); } @@ -198,14 +186,10 @@ test_setting_vpn_update_secrets (void) const char *val2 = "value2"; connection = nm_connection_new (); - ASSERT (connection != NULL, - "vpn-update-secrets", - "error creating connection"); + g_assert (connection); s_vpn = (NMSettingVPN *) nm_setting_vpn_new (); - ASSERT (s_vpn != NULL, - "vpn-update-secrets", - "error creating vpn setting"); + g_assert (s_vpn); nm_connection_add_setting (connection, NM_SETTING (s_vpn)); settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) g_hash_table_destroy); @@ -222,21 +206,17 @@ test_setting_vpn_update_secrets (void) g_hash_table_insert (secrets, (char *) key2, (char *) val2); success = nm_connection_update_secrets (connection, NM_SETTING_VPN_SETTING_NAME, settings, &error); - ASSERT (success == TRUE, - "vpn-update-secrets", "failed to update VPN secrets: %s", error->message); + g_assert_no_error (error); + g_assert (success); /* Read the secrets back out */ tmp = nm_setting_vpn_get_secret (s_vpn, key1); - ASSERT (tmp != NULL, - "vpn-update-secrets", "unexpected failure getting key #1"); - ASSERT (strcmp (tmp, val1) == 0, - "vpn-update-secrets", "unexpected key #1 value"); + g_assert (tmp); + g_assert_cmpstr (tmp, ==, val1); tmp = nm_setting_vpn_get_secret (s_vpn, key2); - ASSERT (tmp != NULL, - "vpn-update-secrets", "unexpected failure getting key #2"); - ASSERT (strcmp (tmp, val2) == 0, - "vpn-update-secrets", "unexpected key #2 value"); + g_assert (tmp); + g_assert_cmpstr (tmp, ==, val2); g_hash_table_destroy (settings); g_object_unref (connection); @@ -341,8 +321,7 @@ test_setting_ip6_config_old_address_array (void) GValue *read_addr, *read_prefix, *read_gw; s_ip6 = (NMSettingIP6Config *) nm_setting_ip6_config_new (); - ASSERT (s_ip6 != NULL, - "ip6-old-addr", "error creating IP6 setting"); + g_assert (s_ip6); g_value_init (&written_value, OLD_DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS); @@ -373,38 +352,29 @@ test_setting_ip6_config_old_address_array (void) g_value_init (&read_value, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS); g_object_get_property (G_OBJECT (s_ip6), NM_SETTING_IP6_CONFIG_ADDRESSES, &read_value); - ASSERT (G_VALUE_HOLDS (&read_value, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS), - "ip6-old-addr", "wrong addresses property value type '%s'", - G_VALUE_TYPE_NAME (&read_value)); + g_assert (G_VALUE_HOLDS (&read_value, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS)); read_addresses = (GPtrArray *) g_value_get_boxed (&read_value); - ASSERT (read_addresses != NULL, - "ip6-old-addr", "missing addresses on readback"); - ASSERT (read_addresses->len == 1, - "ip6-old-addr", "expected one address on readback"); + g_assert (read_addresses); + g_assert_cmpint (read_addresses->len, ==, 1); read_array = (GValueArray *) g_ptr_array_index (read_addresses, 0); read_addr = g_value_array_get_nth (read_array, 0); ba = g_value_get_boxed (read_addr); - ASSERT (ba->len == sizeof (addr), - "ip6-old-addr", "unexpected address item length %d", ba->len); - ASSERT (memcmp (ba->data, &addr[0], sizeof (addr)) == 0, - "ip6-old-addr", "unexpected failure comparing addresses"); + g_assert_cmpint (ba->len, ==, sizeof (addr)); + g_assert_cmpmem (ba->data, ba->len, &addr[0], sizeof (addr)); read_prefix = g_value_array_get_nth (read_array, 1); - ASSERT (g_value_get_uint (read_prefix) == prefix, - "ip6-old-addr", "unexpected failure comparing prefix"); + g_assert_cmpint (g_value_get_uint (read_prefix), ==, prefix); /* Ensure the gateway is all zeros, which is how the 2-item to 3-item * conversion happens. */ read_gw = g_value_array_get_nth (read_array, 2); ba = g_value_get_boxed (read_gw); - ASSERT (ba->len == sizeof (gw), - "ip6-old-addr", "unexpected gateway item length %d", ba->len); - ASSERT (memcmp (ba->data, &gw[0], sizeof (gw)) == 0, - "ip6-old-addr", "unexpected failure comparing gateways"); + g_assert_cmpint (ba->len, ==, sizeof (gw)); + g_assert_cmpmem (ba->data, ba->len, &gw[0], sizeof (gw)); g_ptr_array_unref (addresses); g_value_unset (&written_value); @@ -419,25 +389,17 @@ test_setting_gsm_apn_spaces (void) const char *tmp; s_gsm = (NMSettingGsm *) nm_setting_gsm_new (); - ASSERT (s_gsm != NULL, - "gsm-apn-spaces", - "error creating GSM setting"); + g_assert (s_gsm); /* Trailing space */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar ", NULL); tmp = nm_setting_gsm_get_apn (s_gsm); - ASSERT (tmp != NULL, - "gsm-apn-spaces", "empty APN"); - ASSERT (strcmp (tmp, "foobar") == 0, - "gsm-apn-spaces", "unexpected APN"); + g_assert_cmpstr (tmp, ==, "foobar"); /* Leading space */ g_object_set (s_gsm, NM_SETTING_GSM_APN, " foobar", NULL); tmp = nm_setting_gsm_get_apn (s_gsm); - ASSERT (tmp != NULL, - "gsm-apn-spaces", "empty APN"); - ASSERT (strcmp (tmp, "foobar") == 0, - "gsm-apn-spaces", "unexpected APN"); + g_assert_cmpstr (tmp, ==, "foobar"); } static void @@ -446,36 +408,29 @@ test_setting_gsm_apn_bad_chars (void) gs_unref_object NMSettingGsm *s_gsm = NULL; s_gsm = (NMSettingGsm *) nm_setting_gsm_new (); - ASSERT (s_gsm != NULL, - "gsm-apn-bad-chars", - "error creating GSM setting"); + g_assert (s_gsm); g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL); /* Make sure a valid APN works */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar123.-baz", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == TRUE, - "gsm-apn-bad-chars", "unexpectedly invalid GSM setting"); + g_assert (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* Random invalid chars */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "@#%$@#%@#%", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* Spaces */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar baz", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* 0 characters long */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* 65-character long */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl1", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); } static void @@ -524,15 +479,13 @@ make_test_wsec_setting (const char *detail) NMSettingWirelessSecurity *s_wsec; s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); - ASSERT (s_wsec != NULL, detail, "error creating setting"); - + g_assert (s_wsec); g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "foobarbaz", NM_SETTING_WIRELESS_SECURITY_PSK, "random psk", NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "aaaaaaaaaa", NULL); - return s_wsec; } @@ -547,14 +500,10 @@ test_setting_to_hash_all (void) hash = nm_setting_to_hash (NM_SETTING (s_wsec), NM_SETTING_HASH_FLAG_ALL); /* Make sure all keys are there */ - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT), - "setting-to-hash-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME), - "setting-to-hash-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_PSK), - "setting-to-hash-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_PSK); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0), - "setting-to-hash-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_PSK)); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)); g_hash_table_destroy (hash); g_object_unref (s_wsec); @@ -571,16 +520,12 @@ test_setting_to_hash_no_secrets (void) hash = nm_setting_to_hash (NM_SETTING (s_wsec), NM_SETTING_HASH_FLAG_NO_SECRETS); /* Make sure non-secret keys are there */ - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT), - "setting-to-hash-no-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME), - "setting-to-hash-no-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)); /* Make sure secrets are not there */ - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_PSK) == NULL, - "setting-to-hash-no-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_PSK); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0) == NULL, - "setting-to-hash-no-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_assert (!g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_PSK)); + g_assert (!g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)); g_hash_table_destroy (hash); g_object_unref (s_wsec); @@ -597,16 +542,12 @@ test_setting_to_hash_only_secrets (void) hash = nm_setting_to_hash (NM_SETTING (s_wsec), NM_SETTING_HASH_FLAG_ONLY_SECRETS); /* Make sure non-secret keys are there */ - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT) == NULL, - "setting-to-hash-only-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME) == NULL, - "setting-to-hash-only-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); + g_assert (!g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)); + g_assert (!g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)); /* Make sure secrets are not there */ - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_PSK), - "setting-to-hash-only-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_PSK); - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0), - "setting-to-hash-only-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_PSK)); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)); g_hash_table_destroy (hash); g_object_unref (s_wsec); @@ -628,8 +569,7 @@ test_connection_to_hash_setting_name (void) /* Make sure the keys of the first level hash are setting names, not * the GType name of the setting objects. */ - ASSERT (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME) != NULL, - "connection-to-hash-setting-name", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_SETTING_NAME); + g_assert (g_hash_table_lookup (hash, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME)); g_hash_table_destroy (hash); g_object_unref (connection); @@ -894,24 +834,20 @@ test_connection_new_from_hash (void) static void check_permission (NMSettingConnection *s_con, guint32 idx, - const char *expected_uname, - const char *tag) + const char *expected_uname) { gboolean success; const char *ptype = NULL, *pitem = NULL, *detail = NULL; success = nm_setting_connection_get_permission (s_con, 0, &ptype, &pitem, &detail); - ASSERT (success == TRUE, tag, "unexpected failure getting added permission"); + g_assert (success); - /* Permission type */ - ASSERT (ptype != NULL, tag, "unexpected failure getting permission type"); - ASSERT (strcmp (ptype, "user") == 0, tag, "retrieved unexpected permission type"); + g_assert_cmpstr (ptype, ==, "user"); - /* Permission item */ - ASSERT (pitem != NULL, tag, "unexpected failure getting permission item"); - ASSERT (strcmp (pitem, expected_uname) == 0, tag, "retrieved unexpected permission item"); + g_assert (pitem); + g_assert_cmpstr (pitem, ==, expected_uname); - ASSERT (detail == NULL, tag, "unexpected success getting permission detail"); + g_assert (!detail); } #define TEST_UNAME "asdfasfasdf" @@ -931,79 +867,66 @@ test_setting_connection_permissions_helpers (void) g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strcmp (ptype, \"user\") == 0*"); success = nm_setting_connection_add_permission (s_con, "foobar", "blah", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission type #1"); + g_assert (!success); /* Ensure a bad [type] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*ptype*"); success = nm_setting_connection_add_permission (s_con, NULL, "blah", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission type #2"); + g_assert (!success); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*uname*"); g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", NULL, NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #1"); + g_assert (!success); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*uname[0] != '\\0'*"); g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #2"); + g_assert (!success); /* Ensure an [item] with ':' is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strchr (uname, ':')*"); g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "ad:asdf", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #3"); + g_assert (!success); /* Ensure a non-UTF-8 [item] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (uname, -1, NULL)*"); g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", buf, NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #4"); + g_assert (!success); /* Ensure a non-NULL [detail] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*detail == NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "dafasdf", "asdf"); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad detail"); + g_assert (!success); /* Ensure a valid call results in success */ success = nm_setting_connection_add_permission (s_con, "user", TEST_UNAME, NULL); - ASSERT (success == TRUE, - "setting-connection-permissions-helpers", "unexpected failure adding valid user permisson"); + g_assert (success); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 1, - "setting-connection-permissions-helpers", "unexpected failure getting number of permissions"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 1); - check_permission (s_con, 0, TEST_UNAME, "setting-connection-permissions-helpers"); + check_permission (s_con, 0, TEST_UNAME); /* Check the actual GObject property just to be paranoid */ g_object_get (G_OBJECT (s_con), NM_SETTING_CONNECTION_PERMISSIONS, &list, NULL); - ASSERT (list != NULL, - "setting-connection-permissions-helpers", "unexpected failure getting permissions list"); - ASSERT (g_slist_length (list) == 1, - "setting-connection-permissions-helpers", "unexpected failure getting number of permissions in list"); - ASSERT (strcmp (list->data, expected_perm) == 0, - "setting-connection-permissions-helpers", "unexpected permission property data"); + g_assert (list); + g_assert_cmpint (g_slist_length (list), ==, 1); + g_assert_cmpstr (list->data, ==, expected_perm); g_slist_free_full (list, g_free); /* Now remove that permission and ensure we have 0 permissions */ nm_setting_connection_remove_permission (s_con, 0); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-helpers", "unexpected failure removing permission"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); g_object_unref (s_con); } @@ -1055,69 +978,59 @@ test_setting_connection_permissions_property (void) g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*"); add_permission_property (s_con, "foobar", "blah", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission type #1"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a bad [type] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*"); add_permission_property (s_con, NULL, "blah", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission type #2"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*last_colon > str*"); add_permission_property (s_con, "user", NULL, -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #1"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*last_colon > str*"); add_permission_property (s_con, "user", "", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #2"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure an [item] with ':' in the middle is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*"); add_permission_property (s_con, "user", "ad:asdf", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #3"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure an [item] with ':' at the end is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*"); add_permission_property (s_con, "user", "adasdfaf:", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #4"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a non-UTF-8 [item] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (str, -1, NULL)*"); add_permission_property (s_con, "user", buf, (int) sizeof (buf), NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #5"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a non-NULL [detail] is rejected */ g_test_expect_message ("libnm-util", G_LOG_LEVEL_CRITICAL, "*(last_colon + 1) == '\\0'*"); add_permission_property (s_con, "user", "dafasdf", -1, "asdf"); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad detail"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a valid call results in success */ success = nm_setting_connection_add_permission (s_con, "user", TEST_UNAME, NULL); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 1, - "setting-connection-permissions-property", "unexpected failure adding valid user permisson"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 1); - check_permission (s_con, 0, TEST_UNAME, "setting-connection-permissions-property"); + check_permission (s_con, 0, TEST_UNAME); /* Now remove that permission and ensure we have 0 permissions */ nm_setting_connection_remove_permission (s_con, 0); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected failure removing permission"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); g_object_unref (s_con); } diff --git a/libnm-util/tests/test-libnm-linking.c b/libnm-util/tests/test-libnm-linking.c index a24498f8..0e143e73 100644 --- a/libnm-util/tests/test-libnm-linking.c +++ b/libnm-util/tests/test-libnm-linking.c @@ -19,12 +19,10 @@ * */ -#include "config.h" - -#include <nm-utils.h> - #include "nm-default.h" +#include "nm-utils.h" + extern GType nm_state_get_type (void); int diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index f5423d10..0d451788 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.c @@ -19,13 +19,12 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> +#include "nm-utils.h" -#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-setting-8021x.h" @@ -44,16 +43,20 @@ #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem" -static gboolean -find_hints_item (GPtrArray *hints, const char *item) +static void +_assert_hints_has (GPtrArray *hints, const char *item) { - int i; + guint i; + guint found = 0; + g_assert (hints); + g_assert (item); for (i = 0; i < hints->len; i++) { - if (!strcmp (item, (const char *) g_ptr_array_index (hints, i))) - return TRUE; + g_assert (hints->pdata[i]); + if (!strcmp (item, hints->pdata[i])) + found++; } - return FALSE; + g_assert_cmpint (found, ==, 1); } static NMConnection * @@ -100,18 +103,14 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set CA certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CA_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_client_cert (s_8021x, TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set client certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_private_key (s_8021x, TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, @@ -119,9 +118,7 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set private key '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, error->message); + nmtst_assert_success (success, error); /* IP4 setting */ s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); @@ -129,9 +126,7 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); - ASSERT (nm_connection_verify (connection, &error) == TRUE, - detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + nmtst_assert_connection_verifies_and_normalizable (connection); return connection; } @@ -144,37 +139,19 @@ test_need_tls_secrets_path (void) GPtrArray *hints = NULL; connection = make_tls_connection ("need-tls-secrets-path-key", NM_SETTING_802_1X_CK_SCHEME_PATH); - ASSERT (connection != NULL, - "need-tls-secrets-path-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-secrets-path-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-secrets-path-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Connection is good; clear secrets and ensure private key password is then required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-secrets-path-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-secrets-path-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-secrets-path-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), - "need-tls-secrets-path-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -188,37 +165,19 @@ test_need_tls_secrets_blob (void) GPtrArray *hints = NULL; connection = make_tls_connection ("need-tls-secrets-blob-key", NM_SETTING_802_1X_CK_SCHEME_BLOB); - ASSERT (connection != NULL, - "need-tls-secrets-blob-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-secrets-blob-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-secrets-blob-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Clear secrets and ensure password is again required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-secrets-blob-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-secrets-blob-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-secrets-blob-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), - "need-tls-secrets-blob-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -270,18 +229,14 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set phase2 CA certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CA_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_phase2_client_cert (s_8021x, TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set phase2 client certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, @@ -289,9 +244,7 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set phase2 private key '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, error->message); + nmtst_assert_success (success, error); /* IP4 setting */ s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); @@ -299,9 +252,7 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) g_object_set (s_ip4, NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); - ASSERT (nm_connection_verify (connection, &error) == TRUE, - detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + nmtst_assert_connection_verifies_and_normalizable (connection); return connection; } @@ -315,37 +266,19 @@ test_need_tls_phase2_secrets_path (void) connection = make_tls_phase2_connection ("need-tls-phase2-secrets-path-key", NM_SETTING_802_1X_CK_SCHEME_PATH); - ASSERT (connection != NULL, - "need-tls-phase2-secrets-path-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-phase2-secrets-path-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-phase2-secrets-path-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Connection is good; clear secrets and ensure private key password is then required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-phase2-secrets-path-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-phase2-secrets-path-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-phase2-secrets-path-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), - "need-tls-phase2-secrets-path-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -360,37 +293,19 @@ test_need_tls_phase2_secrets_blob (void) connection = make_tls_phase2_connection ("need-tls-phase2-secrets-blob-key", NM_SETTING_802_1X_CK_SCHEME_BLOB); - ASSERT (connection != NULL, - "need-tls-phase2-secrets-blob-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-phase2-secrets-blob-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-phase2-secrets-blob-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Connection is good; clear secrets and ensure private key password is then required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-phase2-secrets-blob-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-phase2-secrets-blob-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-phase2-secrets-blob-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), - "need-tls-phase2-secrets-blob-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -739,11 +654,13 @@ NMTST_DEFINE (); int main (int argc, char **argv) { GError *error = NULL; + gboolean success; nmtst_init (&argc, &argv, TRUE); - if (!nm_utils_init (&error)) - FAIL ("nm-utils-init", "failed to initialize libnm-util: %s", error->message); + success = nm_utils_init (&error); + g_assert_no_error (error); + g_assert (success); /* The tests */ g_test_add_func ("/libnm/need_tls_secrets_path", test_need_tls_secrets_path); diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c index ad48ac61..e5bddf4c 100644 --- a/libnm-util/tests/test-setting-8021x.c +++ b/libnm-util/tests/test-setting-8021x.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-8021x.h" @@ -41,19 +39,12 @@ compare_blob_data (const char *test, GError *error = NULL; gboolean success; - success = g_file_get_contents (key_path, &contents, &len, &error); - ASSERT (success == TRUE, - test, "failed to read blob key file: %s", error->message); - - ASSERT (len > 0, test, "blob key file invalid (size 0)"); - - ASSERT (len == key->len, - test, "blob key file (%d) and setting key data (%d) lengths don't match", - len, key->len); + g_assert (key && key->len > 0); - ASSERT (memcmp (contents, key->data, len) == 0, - test, "blob key file and blob key data don't match"); + success = g_file_get_contents (key_path, &contents, &len, &error); + nmtst_assert_success (success, error); + g_assert_cmpmem (contents, len, key->data, key->len); g_free (contents); } @@ -62,8 +53,11 @@ compare_blob_data (const char *test, static void check_scheme_path (GByteArray *value, const char *path) { - guint8 *p = value->data; + guint8 *p; + + g_assert (value); + p = value->data; g_assert (memcmp (p, SCHEME_PATH, strlen (SCHEME_PATH)) == 0); p += strlen (SCHEME_PATH); g_assert (memcmp (p, path, strlen (path)) == 0); @@ -85,7 +79,7 @@ test_private_key_import (const char *path, const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "private-key-import", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_private_key (s_8021x, path, @@ -93,29 +87,21 @@ test_private_key_import (const char *path, scheme, &format, &error); - ASSERT (success == TRUE, - "private-key-import", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "private-key-import", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); tmp_fmt = nm_setting_802_1x_get_private_key_format (s_8021x); - ASSERT (tmp_fmt == format, - "private-key-import", "unexpected re-read private key format (expected %d, got %d)", - format, tmp_fmt); + g_assert (tmp_fmt == format); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_private_key_password (s_8021x); - ASSERT (pw != NULL, - "private-key-import", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "private-key-import", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) { tmp_key = (GByteArray *) nm_setting_802_1x_get_private_key_blob (s_8021x); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key blob"); compare_blob_data ("private-key-import", path, tmp_key); } else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) { g_object_get (s_8021x, NM_SETTING_802_1X_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key value"); check_scheme_path (tmp_key, path); g_byte_array_free (tmp_key, TRUE); } else @@ -124,16 +110,13 @@ test_private_key_import (const char *path, /* If it's PKCS#12 ensure the client cert is the same value */ if (format == NM_SETTING_802_1X_CK_FORMAT_PKCS12) { g_object_get (s_8021x, NM_SETTING_802_1X_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key value"); + g_assert (tmp_key); g_object_get (s_8021x, NM_SETTING_802_1X_CLIENT_CERT, &client_cert, NULL); - ASSERT (client_cert != NULL, "private-key-import", "missing client certificate value"); + g_assert (client_cert); /* make sure they are the same */ - ASSERT (tmp_key->len == client_cert->len, - "private-key-import", "unexpected different private key and client cert lengths"); - ASSERT (memcmp (tmp_key->data, client_cert->data, tmp_key->len) == 0, - "private-key-import", "unexpected different private key and client cert data"); + g_assert_cmpmem (tmp_key->data, tmp_key->len, client_cert->data, client_cert->len); g_byte_array_free (tmp_key, TRUE); g_byte_array_free (client_cert, TRUE); @@ -156,7 +139,7 @@ test_phase2_private_key_import (const char *path, const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "phase2-private-key-import", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, path, @@ -164,29 +147,21 @@ test_phase2_private_key_import (const char *path, scheme, &format, &error); - ASSERT (success == TRUE, - "phase2-private-key-import", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "phase2-private-key-import", "unexpected private key format"); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); tmp_fmt = nm_setting_802_1x_get_phase2_private_key_format (s_8021x); - ASSERT (tmp_fmt == format, - "phase2-private-key-import", "unexpected re-read private key format (expected %d, got %d)", - format, tmp_fmt); + g_assert (tmp_fmt == format); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_phase2_private_key_password (s_8021x); - ASSERT (pw != NULL, - "phase2-private-key-import", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "phase2-private-key-import", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) { tmp_key = (GByteArray *) nm_setting_802_1x_get_phase2_private_key_blob (s_8021x); - ASSERT (tmp_key != NULL, "phase2-private-key-import", "missing private key blob"); compare_blob_data ("phase2-private-key-import", path, tmp_key); } else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) { g_object_get (s_8021x, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "phase2-private-key-import", "missing private key value"); check_scheme_path (tmp_key, path); g_byte_array_free (tmp_key, TRUE); } else @@ -195,16 +170,13 @@ test_phase2_private_key_import (const char *path, /* If it's PKCS#12 ensure the client cert is the same value */ if (format == NM_SETTING_802_1X_CK_FORMAT_PKCS12) { g_object_get (s_8021x, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key value"); + g_assert (tmp_key); g_object_get (s_8021x, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &client_cert, NULL); - ASSERT (client_cert != NULL, "private-key-import", "missing client certificate value"); + g_assert (client_cert); /* make sure they are the same */ - ASSERT (tmp_key->len == client_cert->len, - "private-key-import", "unexpected different private key and client cert lengths"); - ASSERT (memcmp (tmp_key->data, client_cert->data, tmp_key->len) == 0, - "private-key-import", "unexpected different private key and client cert data"); + g_assert_cmpmem (tmp_key->data, tmp_key->len, client_cert->data, client_cert->len); g_byte_array_free (tmp_key, TRUE); g_byte_array_free (client_cert, TRUE); @@ -223,7 +195,7 @@ test_wrong_password_keeps_data (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "wrong-password-keeps-data", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_private_key (s_8021x, path, @@ -231,10 +203,8 @@ test_wrong_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "wrong-password-keeps-data", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-password-keeps-data", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Now try to set it to something that's not a certificate */ format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; @@ -244,20 +214,14 @@ test_wrong_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == FALSE, - "wrong-password-keeps-data", "unexpected success reading private key"); - ASSERT (error != NULL, - "wrong-password-keeps-data", "unexpected missing error"); - ASSERT (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-password-keeps-data", "unexpected success reading private key format"); + nmtst_assert_no_success (success, error); + g_assert (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); g_clear_error (&error); /* Make sure the password hasn't changed */ pw = nm_setting_802_1x_get_private_key_password (s_8021x); - ASSERT (pw != NULL, - "wrong-password-keeps-data", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "wrong-password-keeps-data", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); g_object_unref (s_8021x); } @@ -272,7 +236,7 @@ test_clear_private_key (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "clear-private-key", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_private_key (s_8021x, path, @@ -280,17 +244,13 @@ test_clear_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "clear-private-key", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "clear-private-key", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_private_key_password (s_8021x); - ASSERT (pw != NULL, - "clear-private-key", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "clear-private-key", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); /* Now clear it */ success = nm_setting_802_1x_set_private_key (s_8021x, @@ -299,14 +259,10 @@ test_clear_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, NULL, &error); - ASSERT (success == TRUE, - "clear-private-key", "unexpected failure clearing private key"); - ASSERT (error == NULL, - "clear-private-key", "unexpected error clearing private key"); + nmtst_assert_success (success, error); /* Ensure the password is also now clear */ - ASSERT (nm_setting_802_1x_get_private_key_password (s_8021x) == NULL, - "clear-private-key", "unexpected private key password"); + g_assert (!nm_setting_802_1x_get_private_key_password (s_8021x)); g_object_unref (s_8021x); } @@ -321,7 +277,7 @@ test_wrong_phase2_password_keeps_data (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "wrong-phase2-password-keeps-data", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, path, @@ -329,10 +285,8 @@ test_wrong_phase2_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "wrong-phase2-password-keeps-data", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-phase2-password-keeps-data", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Now try to set it to something that's not a certificate */ format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; @@ -342,20 +296,14 @@ test_wrong_phase2_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == FALSE, - "wrong-phase2-password-keeps-data", "unexpected success reading private key"); - ASSERT (error != NULL, - "wrong-phase2-password-keeps-data", "unexpected missing error"); - ASSERT (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-phase2-password-keeps-data", "unexpected success reading private key format"); + nmtst_assert_no_success (success, error); + g_assert (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); g_clear_error (&error); /* Make sure the password hasn't changed */ pw = nm_setting_802_1x_get_phase2_private_key_password (s_8021x); - ASSERT (pw != NULL, - "wrong-phase2-password-keeps-data", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "wrong-phase2-password-keeps-data", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); g_object_unref (s_8021x); } @@ -370,7 +318,7 @@ test_clear_phase2_private_key (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "clear-phase2-private-key", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, path, @@ -378,17 +326,13 @@ test_clear_phase2_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "clear-phase2-private-key", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "clear-phase2-private-key", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_phase2_private_key_password (s_8021x); - ASSERT (pw != NULL, - "clear-phase2-private-key", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "clear-phase2-private-key", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); /* Now clear it */ success = nm_setting_802_1x_set_phase2_private_key (s_8021x, @@ -397,14 +341,10 @@ test_clear_phase2_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, NULL, &error); - ASSERT (success == TRUE, - "clear-phase2-private-key", "unexpected failure clearing private key"); - ASSERT (error == NULL, - "clear-phase2-private-key", "unexpected error clearing private key"); + nmtst_assert_success (success, error); /* Ensure the password is also now clear */ - ASSERT (nm_setting_802_1x_get_phase2_private_key_password (s_8021x) == NULL, - "clear-phase2-private-key", "unexpected private key password"); + g_assert (!nm_setting_802_1x_get_phase2_private_key_password (s_8021x)); g_object_unref (s_8021x); } diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c index 59eac3c5..fb44278b 100644 --- a/libnm-util/tests/test-setting-dcb.c +++ b/libnm-util/tests/test-setting-dcb.c @@ -19,10 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> + +#include "nm-utils.h" #include "nm-default.h" #include "nm-setting-dcb.h" diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c index 09f112cf..95ff0709 100644 --- a/libnm-util/tests/test-settings-defaults.c +++ b/libnm-util/tests/test-settings-defaults.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" @@ -53,9 +51,7 @@ test_defaults (GType type, const char *name) setting = g_object_new (type, NULL); property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs); - ASSERT (property_specs != NULL, - name, "couldn't find property specs for object of type '%s'", - g_type_name (G_OBJECT_TYPE (setting))); + g_assert (property_specs); for (i = 0; i < n_property_specs; i++) { GParamSpec *prop_spec = property_specs[i]; @@ -87,9 +83,7 @@ test_defaults (GType type, const char *name) } else ok = g_param_value_defaults (prop_spec, &value); - ASSERT (ok, - name, "property '%s' value '%s' not the expected default value '%s'", - prop_spec->name, actual, expected); + g_assert (ok); g_free (actual); g_free (expected); |