diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-06-12 14:47:48 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-06-14 17:44:16 +0200 |
| commit | 7e1b03f763350fefa1a68e45764e2076063fdb15 (patch) | |
| tree | 5783342be56399c9e033163e4f415bc774c5d6e5 /tests | |
| parent | 14aadd5b6f12dddd055a7c82c19df4b5ec119843 (diff) | |
vty: command.c: Fix: multi-choice args are no longer passed incomplete to vty func
For instance, take command "multi0 (one|two|three)":
If user executes "multi0 tw", VTY func will receive argv[0]="two"
instead of argv[0]="tw".
Fixes: OS#4045
Change-Id: I91b6621ac3d87fda5412a9b415e7bfb4736c8a9a
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tdef/tdef_vty_test_config_root.vty | 11 | ||||
| -rw-r--r-- | tests/vty/vty_transcript_test.vty | 12 |
2 files changed, 12 insertions, 11 deletions
diff --git a/tests/tdef/tdef_vty_test_config_root.vty b/tests/tdef/tdef_vty_test_config_root.vty index 8613ff36..f3aba0f9 100644 --- a/tests/tdef/tdef_vty_test_config_root.vty +++ b/tests/tdef/tdef_vty_test_config_root.vty @@ -163,7 +163,6 @@ tdef_vty_test(config)# timer te T2 tdef_vty_test(config)# timer test T2 100 tdef_vty_test(config)# timer tes T2 100 -% Error: no timers found tdef_vty_test(config)# timer te T2 100 % Ambiguous command. @@ -219,7 +218,6 @@ tdef_vty_test(config)# timer softw T3 software: T3 = 480 m Fix bugs (default: 480 m) tdef_vty_test(config)# timer softw T3 23 -% Error: no timers found tdef_vty_test(config)# timer tea: T1 = 50 s Water Boiling Timeout (default: 50 s) @@ -234,7 +232,7 @@ test: T2147483647 = 4294967295 m Very large (default: 4294967295 m) test: X23 = 239471 s Negative T number (default: 239471 s) software: T1 = 13 m Write code (default: 30 m) software: T2 = 0 ms Hit segfault (default: 20 ms) -software: T3 = 480 m Fix bugs (default: 480 m) +software: T3 = 23 m Fix bugs (default: 480 m) tdef_vty_test(config)# do show timer tea: T1 = 50 s Water Boiling Timeout (default: 50 s) @@ -249,13 +247,14 @@ test: T2147483647 = 4294967295 m Very large (default: 4294967295 m) test: X23 = 239471 s Negative T number (default: 239471 s) software: T1 = 13 m Write code (default: 30 m) software: T2 = 0 ms Hit segfault (default: 20 ms) -software: T3 = 480 m Fix bugs (default: 480 m) +software: T3 = 23 m Fix bugs (default: 480 m) tdef_vty_test(config)# show running-config ... !timer timer tea T3 32 timer software T1 13 timer software T2 0 +timer software T3 23 ... !timer tdef_vty_test(config)# timer tea T3 default @@ -263,10 +262,12 @@ tdef_vty_test(config)# timer software T1 default tdef_vty_test(config)# show running-config ... !timer timer software T2 0 +timer software T3 23 ... !timer tdef_vty_test(config)# timer softw 2 default -% Error: no timers found tdef_vty_test(config)# timer software 2 default tdef_vty_test(config)# show running-config ... !timer +timer software T3 23 +... !timer diff --git a/tests/vty/vty_transcript_test.vty b/tests/vty/vty_transcript_test.vty index 15577446..f2dbacbf 100644 --- a/tests/vty/vty_transcript_test.vty +++ b/tests/vty/vty_transcript_test.vty @@ -16,13 +16,13 @@ vty_transcript_test> multi0 two ok argc=1 two vty_transcript_test> multi0 o -ok argc=1 o +ok argc=1 one vty_transcript_test> multi0 t % Ambiguous command. vty_transcript_test> multi0 th -ok argc=1 th +ok argc=1 three vty_transcript_test> multi0 % Command incomplete. @@ -39,13 +39,13 @@ vty_transcript_test> multi1 two ok argc=1 two vty_transcript_test> multi1 o -ok argc=1 o +ok argc=1 one vty_transcript_test> multi1 t % Ambiguous command. vty_transcript_test> multi1 th -ok argc=1 th +ok argc=1 three vty_transcript_test> multi1 ok argc=0 @@ -68,10 +68,10 @@ vty_transcript_test> multi2 ok argc=0 vty_transcript_test> multi0 thr -ok argc=1 thr +ok argc=1 three vty_transcript_test> multi1 on -ok argc=1 on +ok argc=1 one vty_transcript_test> multi2 t % Ambiguous command. |