From 8098fb031faed219c3af6d050079aa7b3a9487f3 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Tue, 28 May 2024 19:44:38 +0200 Subject: [PATCH] Test: check openssl 3.3.0 for x509 v1 --- test/lib.sh | 9 ++++++--- test/test_api.sh | 3 +++ test/test_augment.sh | 3 +++ test/test_choice.sh | 3 +++ test/test_client.sh | 3 +++ test/test_confirmed_commit.sh | 3 +++ test/test_copy_config.sh | 3 +++ test/test_debug.sh | 3 +++ test/test_http_data.sh | 3 +++ test/test_identity.sh | 3 +++ test/test_nacm.sh | 3 +++ test/test_nacm_datanode.sh | 3 +++ test/test_nacm_datanode_paths.sh | 3 +++ test/test_nacm_datanode_read.sh | 3 +++ test/test_nacm_datanode_write.sh | 3 +++ test/test_nacm_default.sh | 3 +++ test/test_nacm_ext.sh | 3 +++ test/test_nacm_module_read.sh | 3 +++ test/test_nacm_module_write.sh | 3 +++ test/test_nacm_mount.sh | 3 +++ test/test_nacm_protocol.sh | 3 +++ test/test_nacm_recovery.sh | 3 +++ test/test_netconf_monitoring_location.sh | 3 +++ test/test_pagination_draft.sh | 3 +++ test/test_perf_restconf.sh | 3 +++ test/test_perf_state.sh | 3 +++ test/test_perf_state_only.sh | 3 +++ test/test_restconf.sh | 3 +++ test/test_restconf_basic_auth.sh | 3 +++ test/test_restconf_continue.sh | 3 +++ test/test_restconf_err.sh | 3 +++ test/test_restconf_http_upgrade.sh | 3 +++ test/test_restconf_jukebox.sh | 3 +++ test/test_restconf_listkey.sh | 3 +++ test/test_restconf_noalpn.sh | 3 --- test/test_restconf_notifications.sh | 3 +++ test/test_restconf_op.sh | 3 +++ test/test_restconf_plain_patch.sh | 3 +++ test/test_restconf_startup.sh | 3 +++ test/test_restconf_yang_patch_json.sh | 3 +++ test/test_restconf_yang_patch_xml.sh | 3 +++ test/test_rpc.sh | 3 +++ test/test_submodule.sh | 3 +++ test/test_yang_anydata.sh | 3 +++ test/test_yang_namespace.sh | 3 +++ test/test_yang_schema_mount.sh | 3 +++ test/test_yang_wdcc.sh | 3 +++ test/test_yang_with_defaults.sh | 3 +++ 48 files changed, 144 insertions(+), 6 deletions(-) diff --git a/test/lib.sh b/test/lib.sh index a1c7d8dd..8d4d9c76 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -1268,9 +1268,12 @@ challengePassword = test EOF # Generate CA cert - # XXX v3 requires usage - openssl req -batch -new -x509v1 -days 1 -config $tmpdir/ca.cnf -keyout $cakey -out $cacert || err "Generate CA cert" - + # XXX v3 requires x509 version 1 + if [ $(openssl version|awk '{print $2}') = "3.3.0" ]; then + openssl req -batch -new -x509v1 -days 1 -config $tmpdir/ca.cnf -keyout $cakey -out $cacert || err1 "Generate CA cert" + else + openssl req -batch -new -x509 -days 1 -config $tmpdir/ca.cnf -keyout $cakey -out $cacert || err1 "Generate CA cert" + fi rm -rf $tmpdir } diff --git a/test/test_api.sh b/test/test_api.sh index 7a43b884..b278b46f 100755 --- a/test/test_api.sh +++ b/test/test_api.sh @@ -26,6 +26,9 @@ fi # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_augment.sh b/test/test_augment.sh index 52630bda..683d4ecf 100755 --- a/test/test_augment.sh +++ b/test/test_augment.sh @@ -25,6 +25,9 @@ fyang2=$dir/ietf-interfaces@2019-03-04.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_choice.sh b/test/test_choice.sh index 00d92111..80ca3e1e 100755 --- a/test/test_choice.sh +++ b/test/test_choice.sh @@ -20,6 +20,9 @@ mkdir $clidir # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_client.sh b/test/test_client.sh index b86a409c..9caf6898 100755 --- a/test/test_client.sh +++ b/test/test_client.sh @@ -27,6 +27,9 @@ fi # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_confirmed_commit.sh b/test/test_confirmed_commit.sh index 69f1d204..b8a2af10 100755 --- a/test/test_confirmed_commit.sh +++ b/test/test_confirmed_commit.sh @@ -23,6 +23,9 @@ USER=${BUSER} # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_copy_config.sh b/test/test_copy_config.sh index e0580cb8..80a91011 100755 --- a/test/test_copy_config.sh +++ b/test/test_copy_config.sh @@ -31,6 +31,9 @@ fyang=$dir/ietf-interfaces@2019-03-04.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none true) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_debug.sh b/test/test_debug.sh index da9e42e5..fe1b4fe2 100755 --- a/test/test_debug.sh +++ b/test/test_debug.sh @@ -13,6 +13,9 @@ fyang=$dir/restconf.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_http_data.sh b/test/test_http_data.sh index 74c16652..60aca6ad 100755 --- a/test/test_http_data.sh +++ b/test/test_http_data.sh @@ -128,6 +128,9 @@ function testrun() enable=$2 # true/false RESTCONFIG=$(restconf_config none false $proto $enable) + if [ $? -ne 0 ]; then + err1 "Error when generating certs" + fi if true; then # Proper test setup diff --git a/test/test_identity.sh b/test/test_identity.sh index 32ce5a4a..e88d4806 100755 --- a/test/test_identity.sh +++ b/test/test_identity.sh @@ -13,6 +13,9 @@ fyang=$dir/example-my-crypto.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm.sh b/test/test_nacm.sh index 9b84a3ca..a6c8aa34 100755 --- a/test/test_nacm.sh +++ b/test/test_nacm.sh @@ -19,6 +19,9 @@ fyang=$dir/nacm-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_datanode.sh b/test/test_nacm_datanode.sh index d38a1be6..eb577333 100755 --- a/test/test_nacm_datanode.sh +++ b/test/test_nacm_datanode.sh @@ -50,6 +50,9 @@ fyang2=$dir/itf.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_datanode_paths.sh b/test/test_nacm_datanode_paths.sh index 22775332..3dea3924 100755 --- a/test/test_nacm_datanode_paths.sh +++ b/test/test_nacm_datanode_paths.sh @@ -19,6 +19,9 @@ fyang=$dir/nacm-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_datanode_read.sh b/test/test_nacm_datanode_read.sh index a8b650db..9f053b0d 100755 --- a/test/test_nacm_datanode_read.sh +++ b/test/test_nacm_datanode_read.sh @@ -27,6 +27,9 @@ fyang2=$dir/nacm-example2.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_datanode_write.sh b/test/test_nacm_datanode_write.sh index 77bef448..9a3f8a60 100755 --- a/test/test_nacm_datanode_write.sh +++ b/test/test_nacm_datanode_write.sh @@ -19,6 +19,9 @@ fyang=$dir/nacm-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_default.sh b/test/test_nacm_default.sh index 926d0fbf..cac01083 100755 --- a/test/test_nacm_default.sh +++ b/test/test_nacm_default.sh @@ -15,6 +15,9 @@ fyang=$dir/nacm-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh index 2be56964..a4a1b4b6 100755 --- a/test/test_nacm_ext.sh +++ b/test/test_nacm_ext.sh @@ -18,6 +18,9 @@ nacmfile=$dir/nacmfile # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # Note filter out example_backend_nacm.so in CLICON_BACKEND_REGEXP below cat < $cfg diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh index 1953fd75..c995ec92 100755 --- a/test/test_nacm_module_read.sh +++ b/test/test_nacm_module_read.sh @@ -21,6 +21,9 @@ fyang2=$dir/clixon-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh index 35dd6fa1..bbbcee9c 100755 --- a/test/test_nacm_module_write.sh +++ b/test/test_nacm_module_write.sh @@ -34,6 +34,9 @@ fyang2=$dir/clixon-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_mount.sh b/test/test_nacm_mount.sh index 48588bad..06586ab5 100755 --- a/test/test_nacm_mount.sh +++ b/test/test_nacm_mount.sh @@ -21,6 +21,9 @@ CFD=$dir/conf.d test -d $CFD || mkdir -p $CFD RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh index c64f5022..59ef89fe 100755 --- a/test/test_nacm_protocol.sh +++ b/test/test_nacm_protocol.sh @@ -36,6 +36,9 @@ fyang=$dir/nacm-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_nacm_recovery.sh b/test/test_nacm_recovery.sh index a55bed49..b1468096 100755 --- a/test/test_nacm_recovery.sh +++ b/test/test_nacm_recovery.sh @@ -24,6 +24,9 @@ NACMUSER=$(whoami) # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $fyang module nacm-example{ diff --git a/test/test_netconf_monitoring_location.sh b/test/test_netconf_monitoring_location.sh index 3267d2f4..5830c787 100755 --- a/test/test_netconf_monitoring_location.sh +++ b/test/test_netconf_monitoring_location.sh @@ -22,6 +22,9 @@ datapath=/data wdir=$dir/www RESTCONFIG=$(restconf_config none false $RCPROTO $enable) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_pagination_draft.sh b/test/test_pagination_draft.sh index 1afa881e..78fda84f 100755 --- a/test/test_pagination_draft.sh +++ b/test/test_pagination_draft.sh @@ -17,6 +17,9 @@ fstate=$dir/mystate.xml # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # Validate internal state xml : ${validatexml:=false} diff --git a/test/test_perf_restconf.sh b/test/test_perf_restconf.sh index de49e452..9f0e8d16 100755 --- a/test/test_perf_restconf.sh +++ b/test/test_perf_restconf.sh @@ -67,6 +67,9 @@ EOF # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_perf_state.sh b/test/test_perf_state.sh index fe75a5fb..a421a272 100755 --- a/test/test_perf_state.sh +++ b/test/test_perf_state.sh @@ -31,6 +31,9 @@ fstate=$dir/state.xml # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_perf_state_only.sh b/test/test_perf_state_only.sh index 5b160441..ce08008f 100755 --- a/test/test_perf_state_only.sh +++ b/test/test_perf_state_only.sh @@ -30,6 +30,9 @@ fstate=$dir/state.xml # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_restconf.sh b/test/test_restconf.sh index 65e1be3d..6bd6321d 100755 --- a/test/test_restconf.sh +++ b/test/test_restconf.sh @@ -53,6 +53,9 @@ if [ "${WITH_RESTCONF}" = "native" ]; then else # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) + if [ $? -ne 0 ]; then + err1 "Error when generating certs" + fi fi # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there diff --git a/test/test_restconf_basic_auth.sh b/test/test_restconf_basic_auth.sh index 0bce377b..b74938a3 100755 --- a/test/test_restconf_basic_auth.sh +++ b/test/test_restconf_basic_auth.sh @@ -179,6 +179,9 @@ function testrun() # Change restconf configuration before start restconf daemon RESTCONFIG=$(restconf_config $auth false) + if [ $? -ne 0 ]; then + err1 "Error when generating certs" + fi # Start with common config, then append fcgi/native specific config cat < $cfg diff --git a/test/test_restconf_continue.sh b/test/test_restconf_continue.sh index 7f1847e2..1898b3c4 100755 --- a/test/test_restconf_continue.sh +++ b/test/test_restconf_continue.sh @@ -27,6 +27,9 @@ fjson=$dir/large.json # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_restconf_err.sh b/test/test_restconf_err.sh index 7671ec53..928c5c9f 100755 --- a/test/test_restconf_err.sh +++ b/test/test_restconf_err.sh @@ -53,6 +53,9 @@ fstate=$dir/state.xml # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_restconf_http_upgrade.sh b/test/test_restconf_http_upgrade.sh index 49b07e51..1a5d68af 100755 --- a/test/test_restconf_http_upgrade.sh +++ b/test/test_restconf_http_upgrade.sh @@ -29,6 +29,9 @@ cfg=$dir/conf.xml RCPROTO=http RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # Clixon config cat < $cfg diff --git a/test/test_restconf_jukebox.sh b/test/test_restconf_jukebox.sh index 0ed305e1..270fd286 100755 --- a/test/test_restconf_jukebox.sh +++ b/test/test_restconf_jukebox.sh @@ -25,6 +25,9 @@ EOF # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_restconf_listkey.sh b/test/test_restconf_listkey.sh index cead7595..b94af437 100755 --- a/test/test_restconf_listkey.sh +++ b/test/test_restconf_listkey.sh @@ -13,6 +13,9 @@ fyang=$dir/list.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_restconf_noalpn.sh b/test/test_restconf_noalpn.sh index ce328a22..72c5fae7 100755 --- a/test/test_restconf_noalpn.sh +++ b/test/test_restconf_noalpn.sh @@ -25,9 +25,6 @@ APPNAME=example cfg=$dir/conf.xml fyang=$dir/restconf.yang -# Define default restconfig config: RESTCONFIG -# RESTCONFIG=$(restconf_config none false) - # Local for test here certdir=$dir/certs test -d $certdir || mkdir $certdir diff --git a/test/test_restconf_notifications.sh b/test/test_restconf_notifications.sh index 96d3307b..bed37706 100755 --- a/test/test_restconf_notifications.sh +++ b/test/test_restconf_notifications.sh @@ -53,6 +53,9 @@ xml=$dir/xml.xml # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_restconf_op.sh b/test/test_restconf_op.sh index 6f960e99..f6f62d89 100755 --- a/test/test_restconf_op.sh +++ b/test/test_restconf_op.sh @@ -15,6 +15,9 @@ fyang=$dir/restconf.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi # example cat < $cfg diff --git a/test/test_restconf_plain_patch.sh b/test/test_restconf_plain_patch.sh index 7a75d0ad..f8e70859 100755 --- a/test/test_restconf_plain_patch.sh +++ b/test/test_restconf_plain_patch.sh @@ -14,6 +14,9 @@ fjukebox=$dir/example-jukebox.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_restconf_startup.sh b/test/test_restconf_startup.sh index ee53df4f..c6fb8fad 100755 --- a/test/test_restconf_startup.sh +++ b/test/test_restconf_startup.sh @@ -36,6 +36,9 @@ EOF # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none true) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_restconf_yang_patch_json.sh b/test/test_restconf_yang_patch_json.sh index 5d714975..d1799e47 100755 --- a/test/test_restconf_yang_patch_json.sh +++ b/test/test_restconf_yang_patch_json.sh @@ -22,6 +22,9 @@ fjukebox=$dir/example-jukebox.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_restconf_yang_patch_xml.sh b/test/test_restconf_yang_patch_xml.sh index c8b7e4ee..728578c4 100755 --- a/test/test_restconf_yang_patch_xml.sh +++ b/test/test_restconf_yang_patch_xml.sh @@ -23,6 +23,9 @@ fexample=$dir/clixon-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config user false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_rpc.sh b/test/test_rpc.sh index 9a3f34fb..7d1692aa 100755 --- a/test/test_rpc.sh +++ b/test/test_rpc.sh @@ -17,6 +17,9 @@ fyang=$dir/clixon-example.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_submodule.sh b/test/test_submodule.sh index ed0908cf..62f459ed 100755 --- a/test/test_submodule.sh +++ b/test/test_submodule.sh @@ -29,6 +29,9 @@ fextra2=$dir/extra2.yang # Referenced from sub2 # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_yang_anydata.sh b/test/test_yang_anydata.sh index 20aa416a..d3201807 100755 --- a/test/test_yang_anydata.sh +++ b/test/test_yang_anydata.sh @@ -23,6 +23,9 @@ fstate=$dir/state.xml # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $fanydata module any{ diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh index 8c8e343d..57e91d4d 100755 --- a/test/test_yang_namespace.sh +++ b/test/test_yang_namespace.sh @@ -15,6 +15,9 @@ fyang2=$dir/example2.yang # Define default restconfig config: RESTCONFIG RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_yang_schema_mount.sh b/test/test_yang_schema_mount.sh index 712d15b4..4d6f93ab 100755 --- a/test/test_yang_schema_mount.sh +++ b/test/test_yang_schema_mount.sh @@ -21,6 +21,9 @@ test -d $CFD || mkdir -p $CFD AUTOCLI=$(autocli_config clixon-\* kw-nokey false) RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_yang_wdcc.sh b/test/test_yang_wdcc.sh index bf816ec6..11e61bcc 100755 --- a/test/test_yang_wdcc.sh +++ b/test/test_yang_wdcc.sh @@ -15,6 +15,9 @@ fyang=$dir/example-default.yang fstate=$dir/state.xml clispec=$dir/spec.cli RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg diff --git a/test/test_yang_with_defaults.sh b/test/test_yang_with_defaults.sh index 0de6f2f4..e8ce796e 100755 --- a/test/test_yang_with_defaults.sh +++ b/test/test_yang_with_defaults.sh @@ -18,6 +18,9 @@ fyang=$dir/example-default.yang fstate=$dir/state.xml clispec=$dir/spec.cli RESTCONFIG=$(restconf_config none false) +if [ $? -ne 0 ]; then + err1 "Error when generating certs" +fi cat < $cfg