From c218fd44bcfcadc494a6ca5999c3c229e569e7ac Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 17 Jan 2017 23:44:03 +0100 Subject: [PATCH] tests: fix tests without libjansson support (--enable-json-validation=no) (cherry picked from commit a5acd0bdc63449d9b499b62479f612c216cf24c0) --- libnm-core/tests/test-general.c | 4 +++- .../tests/network-scripts/ifcfg-test-team-master-invalid | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index 1cb8d7af99..b9fef8da6a 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -4708,7 +4708,9 @@ test_nm_utils_check_valid_json (void) #else /* Without JSON library everything except empty string is considered valid */ _json_config_check_valid ("{ }", TRUE); - _json_config_check_valid ("{'%!-a1", TRUE); + _json_config_check_valid ("{'%!-a1} ", TRUE); + _json_config_check_valid (" {'%!-a1}", TRUE); + _json_config_check_valid ("{'%!-a1", FALSE); #endif } diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid index 4534882eea..41c0f25c64 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid @@ -1,4 +1,4 @@ DEVICE=team0 ONBOOT=no BOOTPROTO=dhcp -TEAM_CONFIG="{ foobar }" +TEAM_CONFIG="{ foobar }x"