summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Test/Y03arguments.ztst19
2 files changed, 12 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f688c669b..5e217deed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-12-10  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 40139: Test/Y03arguments.ztst: tests: Convert comments to
+	diagnostics; test backslashes. (after 40129)
+
 	* users/22182: Completion/Zsh/Context/_brace_parameter: Propagate
 	22161 docs patch to completion descriptions.
 
diff --git a/Test/Y03arguments.ztst b/Test/Y03arguments.ztst
index b5a5a4be9..6f0cac034 100644
--- a/Test/Y03arguments.ztst
+++ b/Test/Y03arguments.ztst
@@ -40,14 +40,13 @@
 >NO:{a}
 >NO:{b}
 
-# it ought to be possible to include the quoted backslash here
- tst_arguments ':desc2:((a\:a\ value b\:other\\value))'
+ tst_arguments ':desc2:((a\:a\ value b\:other\\\\value))'
  comptest $'tst \t'
 0:a and b with descriptions
 >line: {tst }{}
 >DESCRIPTION:{desc2}
 >NO:{a  -- a value}
->NO:{b  -- othervalue}
+>NO:{b  -- other\value}
 
  tst_arguments ':desc1:(arg1)' ':desc2:(arg2)' ':desc3:(arg3)'
  comptest $'tst \t\t\t\C-w\C-w\C-w\C-d'
@@ -430,7 +429,6 @@
 >line: {tst -h -}{}
 >MESSAGE:{no arguments}
 
-# this would ideally not offer -b as it is already on the command-line
  tst_arguments -a '(-a)-b'
  comptest $'tst - -b\C-b\C-b\C-b\t'
 0:exclusion only applies to later words
@@ -438,8 +436,8 @@
 >DESCRIPTION:{option}
 >NO:{-a}
 >NO:{-b}
+F:shouldn't offer -b as it is already on the command-line
 
-# ideally, would handle exclusion within the current word
  tst_arguments -s : '(-d)-a' -b -c -d
  comptest $'tst -ab\t -\t\eb\eb \C-b-\t'
 0:exclusion with clumped options, in, after and before
@@ -454,17 +452,18 @@
 >NO:{-b}
 >NO:{-c}
 >NO:{-d}
+F:the first tab press shouldn't offer -d since -a is on the command line
 
  tst_arguments '-a:arg' -b '(-b)-c'
  comptest $'tst -a -c -\t'
 0:exclusion with option argument that looks like an option
 >line: {tst -a -c -}{}
 >MESSAGE:{no arguments}
-# seems we don't handle this case, ideal result would be as follows
-#>line: {tst -a -c -}{}
-#>DESCRIPTION:{option}
-#>NO:{-b}
-#>NO:{-c}
+F:The current behaviour is wrong; the correct expected output is:
+F:>line: {tst -a -c -}{}
+F:>DESCRIPTION:{option}
+F:>NO:{-b}
+F:>NO:{-c}
 
  tst_arguments --abc --aah :arg:
  comptesteval 'setopt bashautolist automenu'