From ba8ce3bbe511a3df2b2b3c66eeb13429896c59b6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 26 Mar 2015 13:45:24 +0100 Subject: [PATCH] route-manager/test: check for exact expected error message --- src/tests/test-route-manager.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c index ab1faeb9fa..1e7f02c92f 100644 --- a/src/tests/test-route-manager.c +++ b/src/tests/test-route-manager.c @@ -245,7 +245,7 @@ test_ip4 (test_fixture *fixture, gconstpointer user_data) }; setup_dev0_ip4 (fixture->ifindex0); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding 8.0.0.0/8 via 6.6.6.2 dev nm-test-device1 *"); setup_dev1_ip4 (fixture->ifindex1); g_test_assert_expected_messages (); @@ -258,7 +258,7 @@ test_ip4 (test_fixture *fixture, gconstpointer user_data) g_array_free (routes, TRUE); setup_dev1_ip4 (fixture->ifindex1); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding 8.0.0.0/8 via 6.6.6.2 dev nm-test-device1 *"); setup_dev0_ip4 (fixture->ifindex0); g_test_assert_expected_messages (); @@ -268,7 +268,7 @@ test_ip4 (test_fixture *fixture, gconstpointer user_data) nmtst_platform_ip4_routes_equal ((NMPlatformIP4Route *) routes->data, state1, routes->len); g_array_free (routes, TRUE); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding 8.0.0.0/8 via 6.6.6.2 dev nm-test-device1 *"); update_dev0_ip4 (fixture->ifindex0); g_test_assert_expected_messages (); @@ -582,7 +582,7 @@ test_ip6 (test_fixture *fixture, gconstpointer user_data) }; setup_dev0_ip6 (fixture->ifindex0); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding 2001:db8:d34d::/64 via 2001:db8:8086::2 dev nm-test-device1 *"); setup_dev1_ip6 (fixture->ifindex1); g_test_assert_expected_messages (); @@ -596,7 +596,7 @@ test_ip6 (test_fixture *fixture, gconstpointer user_data) g_array_free (routes, TRUE); setup_dev1_ip6 (fixture->ifindex1); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding 2001:db8:d34d::/64 via 2001:db8:8086::2 dev nm-test-device1 *"); setup_dev0_ip6 (fixture->ifindex0); g_test_assert_expected_messages (); @@ -606,7 +606,7 @@ test_ip6 (test_fixture *fixture, gconstpointer user_data) nmtst_platform_ip6_routes_equal ((NMPlatformIP6Route *) routes->data, state1, routes->len); g_array_free (routes, TRUE); - g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding*"); + g_test_expect_message ("NetworkManager", G_LOG_LEVEL_WARNING, "*error adding 2001:db8:d34d::/64 via 2001:db8:8086::2 dev nm-test-device1 *"); update_dev0_ip6 (fixture->ifindex0); g_test_assert_expected_messages ();