experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exit typo in test

Browse source
This commit is contained in:
Olof hagsand 2020-03-24 20:57:41 +01:00
parent a7e0a30938
commit 4e578b77ee
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/cli/cli_main.c
View file

@ -587,11 +587,7 @@ main(int argc, char **argv)
restarg = clicon_strjoin(argc, argv, " "); restarg = clicon_strjoin(argc, argv, " ");
/* If several cligen object variables match same preference, select first */ /* If several cligen object variables match same preference, select first */
#if 0 /* New cligen version (not in 4.4) */
cligen_preference_mode_set(cli_cligen(h), 1); cligen_preference_mode_set(cli_cligen(h), 1);
#else
cligen_match_cgvar_same(1);
#endif
/* Call start function in all plugins before we go interactive /* Call start function in all plugins before we go interactive
*/ */

2
test/test_upgrade.sh
View file

@ -334,7 +334,7 @@ new "5. Load non-compat invalid startup. Enter failsafe, startup invalid."
(cd $dir; cp non-compat-invalid.xml startup_db) (cd $dir; cp non-compat-invalid.xml startup_db)
runtest true startup '<data><a1 xmlns="urn:example:a">always work</a1></data>' '<data><a0 xmlns="urn:example:a">old version</a0><a1 xmlns="urn:example:a">always work</a1><b xmlns="urn:example:b">other text</b><c xmlns="urn:example:c">bla bla</c></data>' # sorted runtest true startup '<data><a1 xmlns="urn:example:a">always work</a1></data>' '<data><a0 xmlns="urn:example:a">old version</a0><a1 xmlns="urn:example:a">always work</a1><b xmlns="urn:example:b">other text</b><c xmlns="urn:example:c">bla bla</c></data>' # sorted
#runtest true startup '<data><a1 xmlns="urn:example:a">always work</a1></data>' '<data><a0 xmlns="urn:example:a">old version</a0><c xmlns="urn:example:c">bla bla</c><a1 xmlns="urn:example:a">always work</a1><b xmlns="urn:example:b">other text</b></data>' # unsorted #runtest true startup '<data><a1 xmlns="urn:example:a">always work</a1></data>' '<data><a0 xmlns="urn:example:a">old version</a0><c xmlns="urn:example:c">bla bla</c><a1 xmlns="urn:example:a">always work</a1><b xmlns="urn:example:b">other text</b></data>' # unsorted
exit
new "6. Load non-compat invalid running. Enter failsafe, startup invalid." new "6. Load non-compat invalid running. Enter failsafe, startup invalid."
(cd $dir; rm -f tmp_db candidate_db running_db startup_db) # remove databases (cd $dir; rm -f tmp_db candidate_db running_db startup_db) # remove databases
(cd $dir; cp non-compat-invalid.xml running_db) (cd $dir; cp non-compat-invalid.xml running_db)