Reviewed tests q* & r*

Added .swp (vim backup) files to .gitignore

.gitignore

@@ -1,4 +1,5 @@
 *.tar*
+*.swp
 Makefile
 Makefile.in
 aclocal.m4

test/_completion_to_review/qrunner.exp

@@ -1 +0,0 @@
-source "lib/completions/qrunner.exp"

test/_completion_to_review/querybts.exp

@@ -1 +0,0 @@
-source "lib/completions/querybts.exp"

test/_completion_to_review/rcs.exp

@@ -1 +0,0 @@
-source "lib/completions/rcs.exp"

test/_completion_to_review/rcsdiff.exp

@@ -1 +0,0 @@
-source "lib/completions/rcsdiff.exp"

test/_completion_to_review/readelf.exp

@@ -1 +0,0 @@
-source "lib/completions/readelf.exp"

test/_completion_to_review/readonly.exp

@@ -1 +0,0 @@
-source "lib/completions/readonly.exp"

test/_completion_to_review/remove_members.exp

@@ -1 +0,0 @@
-source "lib/completions/remove_members.exp"

test/_completion_to_review/removepkg.exp

@@ -1 +0,0 @@
-source "lib/completions/removepkg.exp"

test/_completion_to_review/renice.exp

@@ -1 +0,0 @@
-source "lib/completions/renice.exp"

test/_completion_to_review/reportbug.exp

@@ -1 +0,0 @@
-source "lib/completions/reportbug.exp"

test/_completion_to_review/ri.exp

@@ -1 +0,0 @@
-source "lib/completions/ri.exp"

test/_completion_to_review/rlog.exp

@@ -1 +0,0 @@
-source "lib/completions/rlog.exp"

test/_completion_to_review/rm.exp

@@ -1 +0,0 @@
-source "lib/completions/rm.exp"

test/_completion_to_review/rmdir.exp

@@ -1 +0,0 @@
-source "lib/completions/rmdir.exp"

test/_completion_to_review/rmlist.exp

@@ -1 +0,0 @@
-source "lib/completions/rmlist.exp"

test/_completion_to_review/rsync.exp

@@ -1 +0,0 @@
-source "lib/completions/rsync.exp"

test/completion/qrunner.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type qrunner]} {
+    source "lib/completions/qrunner.exp"
+}; # if

test/completion/querybts.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type querybts]} {
+    source "lib/completions/querybts.exp"
+}; # if

test/completion/rcs.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rcs]} {
+    source "lib/completions/rcs.exp"
+}; # if

test/completion/rcsdiff.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rcsdiff]} {
+    source "lib/completions/rcsdiff.exp"
+}; # if

test/completion/readelf.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type readelf]} {
+    source "lib/completions/readelf.exp"
+}; # if

test/completion/readonly.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type readonly]} {
+    source "lib/completions/readonly.exp"
+}; # if

test/completion/remove_members.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type remove_members]} {
+    source "lib/completions/remove_members.exp"
+}; # if

test/completion/removepkg.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type removepkg]} {
+    source "lib/completions/removepkg.exp"
+}; # if

test/completion/renice.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type {renice}]} {
+    source "lib/completions/renice.exp"
+}; # if

test/completion/reportbug.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type reportbug]} {
+    source "lib/completions/reportbug.exp"
+}; # if

test/completion/ri.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type ri]} {
+    source "lib/completions/ri.exp"
+}; # if

test/completion/rlog.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rlog]} {
+    source "lib/completions/rlog.exp"
+}; # if

test/completion/rm.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rm]} {
+    source "lib/completions/rm.exp"
+}; # if

test/completion/rmdir.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rmdir]} {
+    source "lib/completions/rmdir.exp"
+}; # if

test/completion/rmlist.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rmlist]} {
+    source "lib/completions/rmlist.exp"
+}; # if

test/completion/rsync.exp

@@ -0,0 +1,3 @@
+if {[assert_bash_type rsync]} {
+    source "lib/completions/rsync.exp"
+}; # if

test/lib/completions/qrunner.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "qrunner -"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/querybts.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "querybts --"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rcs.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rcs "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rcsdiff.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rcsdiff "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rdict.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rdict --"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/readelf.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "readelf --"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/readonly.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "readonly BASH_ARG"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/remove_members.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "remove_members --"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/removepkg.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "removepkg "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/renice.exp

@@ -1,20 +1,22 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()
 
 
 setup
 
 
-set test "Tab should show completions"
+set test "Tab should show complete process ids"
     # Try completion
 set cmd "renice 1"
 send "$cmd\t"
 expect {
-    -re "$cmd\r\n.*$cmd$" { pass "$test" }
+    -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
 }; # expect
@@ -28,7 +30,7 @@ set test "Tab should show complete process group ids"
 set cmd "renice -g "
 send "$cmd\t"
 expect {
-    -re "$cmd$" { pass "$test" }
+    -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
 }; # expect

test/lib/completions/reportbug.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "reportbug --m"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/ri.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ri "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rlog.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rlog "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rm.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rm "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rmdir.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rmdir "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rmlist.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rmlist -"
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/rsync.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "rsync "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions_to_review/qrunner.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "qrunner -"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/querybts.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "querybts --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rcs.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rcs "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rcsdiff.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rcsdiff "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rdict.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rdict --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/readelf.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "readelf "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/readonly.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "readonly BASH_ARG"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/remove_members.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "remove_members --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/removepkg.exp

@@ -1,29 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "removepkg "
-send "$cmd\t"
-  # NOTE: Wait in case `kldload' isn't installed, so that "^$cdm.*$" doesn't match
-  #       before comp_install has finished
-sleep .4
-expect {
-    -re "^$cmd.*$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/reportbug.exp

@@ -1,41 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "reportbug --m"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-set test "Completing --editor should invoke _command"
-    # Try completion
-set cmd "reportbug --editor vim"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/ri.exp

@@ -1,29 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "ri "
-send "$cmd\t"
-  # NOTE: Wait in case `ri' isn't installed, so that "^$cdm.*$" doesn't match
-  #       before comp_install has finished
-sleep 1 
-expect {
-    -re "^$cmd.*$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rlog.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rlog "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rm.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rm "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rmdir.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rmdir "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rmlist.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "rmlist -"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown

test/lib/completions_to_review/rsync.exp

@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should show completions"
-    # Try completion
-set cmd "rsync "
-send "$cmd\t"
-expect {
-    -re "$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown