diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-06-23 18:07:55 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-06-23 18:09:28 +0200 |
| commit | 2b0b0375d38edd687055f84be895822801618c4a (patch) | |
| tree | acd3aab5044a9bc5950925161b591a08b6e60f53 /libnm-core/tests | |
| parent | 093c9db7b2a46e6042009e703e2e891abd2d2ba3 (diff) | |
| parent | 5ed4e66e01b005212aee22c255c9c6b2a4b040a9 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'libnm-core/tests')
| -rw-r--r-- | libnm-core/tests/test-general.c | 2 | ||||
| -rw-r--r-- | libnm-core/tests/test-setting.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 138702e4..2b1f1e3d 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -4277,7 +4277,7 @@ test_hwaddr_equal (void) g_assert (nm_utils_hwaddr_matches (null_binary, sizeof (null_binary), null_binary, sizeof (null_binary))); g_assert (nm_utils_hwaddr_matches (null_binary, sizeof (null_binary), NULL, ETH_ALEN)); - g_assert (nm_utils_hwaddr_matches (NULL, -1, NULL, -1)); + g_assert (!nm_utils_hwaddr_matches (NULL, -1, NULL, -1)); g_assert (!nm_utils_hwaddr_matches (NULL, -1, string, -1)); g_assert (!nm_utils_hwaddr_matches (string, -1, NULL, -1)); g_assert (!nm_utils_hwaddr_matches (NULL, -1, null_string, -1)); diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c index cb8f41fb..072be57a 100644 --- a/libnm-core/tests/test-setting.c +++ b/libnm-core/tests/test-setting.c @@ -2051,8 +2051,8 @@ test_tc_config_qdisc (void) nmtst_assert_success (qdisc1, error); g_assert_cmpstr (nm_tc_qdisc_get_kind (qdisc1), ==, "pfifo_fast"); - g_assert (nm_tc_qdisc_get_handle (qdisc1) == TC_H_MAKE (0x1234 << 16, 0x0000)); - g_assert (nm_tc_qdisc_get_parent (qdisc1) == TC_H_MAKE (0xfff1 << 16, 0x0001)); + g_assert (nm_tc_qdisc_get_handle (qdisc1) == TC_H_MAKE (0x1234u << 16, 0x0000u)); + g_assert (nm_tc_qdisc_get_parent (qdisc1) == TC_H_MAKE (0xfff1u << 16, 0x0001u)); str = nm_utils_tc_qdisc_to_str (qdisc1, &error); nmtst_assert_success (str, error); @@ -2133,12 +2133,12 @@ test_tc_config_tfilter (void) GError *error = NULL; tfilter1 = nm_tc_tfilter_new ("matchall", - TC_H_MAKE (0x1234 << 16, 0x0000), + TC_H_MAKE (0x1234u << 16, 0x0000u), &error); nmtst_assert_success (tfilter1, error); tfilter2 = nm_tc_tfilter_new ("matchall", - TC_H_MAKE (0x1234 << 16, 0x0000), + TC_H_MAKE (0x1234u << 16, 0x0000u), &error); nmtst_assert_success (tfilter2, error); @@ -2192,10 +2192,10 @@ test_tc_config_setting_valid (void) nmtst_assert_success (qdisc1, error); qdisc2 = nm_tc_qdisc_new ("pfifo_fast", - TC_H_MAKE (0xfff1 << 16, 0x0001), + TC_H_MAKE (0xfff1u << 16, 0x0001u), &error); nmtst_assert_success (qdisc2, error); - nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (0x1234 << 16, 0x0000)); + nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (0x1234u << 16, 0x0000u)); g_assert (nm_setting_tc_config_get_num_qdiscs (s_tc) == 0); g_assert (nm_setting_tc_config_add_qdisc (s_tc, qdisc1) == TRUE); @@ -2298,16 +2298,16 @@ test_tc_config_dbus (void) qdisc1 = nm_tc_qdisc_new ("fq_codel", TC_H_ROOT, &error); nmtst_assert_success (qdisc1, error); - nm_tc_qdisc_set_handle (qdisc1, TC_H_MAKE (0x1234 << 16, 0x0000)); + nm_tc_qdisc_set_handle (qdisc1, TC_H_MAKE (0x1234u << 16, 0x0000u)); nm_setting_tc_config_add_qdisc (NM_SETTING_TC_CONFIG (s_tc), qdisc1); qdisc2 = nm_tc_qdisc_new ("ingress", TC_H_INGRESS, &error); nmtst_assert_success (qdisc2, error); - nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (TC_H_INGRESS, 0)); + nm_tc_qdisc_set_handle (qdisc2, TC_H_MAKE (TC_H_INGRESS, 0u)); nm_setting_tc_config_add_qdisc (NM_SETTING_TC_CONFIG (s_tc), qdisc2); tfilter1 = nm_tc_tfilter_new ("matchall", - TC_H_MAKE (0x1234 << 16, 0x0000), + TC_H_MAKE (0x1234u << 16, 0x0000u), &error); nmtst_assert_success (tfilter1, error); action = nm_tc_action_new ("drop", &error); @@ -2318,7 +2318,7 @@ test_tc_config_dbus (void) nm_tc_tfilter_unref (tfilter1); tfilter2 = nm_tc_tfilter_new ("matchall", - TC_H_MAKE (TC_H_INGRESS, 0), + TC_H_MAKE (TC_H_INGRESS, 0u), &error); nmtst_assert_success (tfilter2, error); action = nm_tc_action_new ("simple", &error); |