From 53b1c41c160c3b112cbf6491f5c8840edd289e18 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 24 Jul 2009 11:58:02 +0200
Subject: [PATCH] Reviewed tests p*

---
 test/_completion_to_review/p4.exp             |  1 -
 test/_completion_to_review/paste.exp          |  1 -
 test/_completion_to_review/patch.exp          |  1 -
 test/_completion_to_review/perl.exp           |  1 -
 test/_completion_to_review/perldoc.exp        |  1 -
 test/_completion_to_review/pine.exp           |  1 -
 test/_completion_to_review/pkg_deinstall.exp  |  1 -
 test/_completion_to_review/pkg_delete.exp     |  1 -
 test/_completion_to_review/pkg_info.exp       |  1 -
 test/_completion_to_review/portinstall.exp    |  1 -
 test/_completion_to_review/portupgrade.exp    |  1 -
 test/_completion_to_review/povray.exp         |  1 -
 test/_completion_to_review/pr.exp             |  1 -
 test/_completion_to_review/psql.exp           |  1 -
 test/_completion_to_review/ptx.exp            |  1 -
 test/_completion_to_review/python.exp         |  1 -
 test/completion/p4.exp                        |  3 ++
 test/completion/paste.exp                     |  3 ++
 test/completion/patch.exp                     |  3 ++
 test/completion/perl.exp                      |  3 ++
 test/completion/perldoc.exp                   |  3 ++
 test/completion/pine.exp                      |  3 ++
 .../pkg-config.exp                            |  0
 test/completion/pkg_deinstall.exp             |  3 ++
 test/completion/pkg_delete.exp                |  3 ++
 test/completion/pkg_info.exp                  |  3 ++
 test/completion/portinstall.exp               |  3 ++
 test/completion/portupgrade.exp               |  3 ++
 test/completion/povray.exp                    |  3 ++
 test/completion/pr.exp                        |  3 ++
 test/completion/psql.exp                      |  3 ++
 test/completion/ptx.exp                       |  3 ++
 .../pvchange.exp                              |  0
 .../pvcreate.exp                              |  0
 .../pvdisplay.exp                             |  0
 .../pvmove.exp                                |  0
 .../pvremove.exp                              |  0
 .../pvs.exp                                   |  0
 .../pvscan.exp                                |  0
 test/completion/python.exp                    |  3 ++
 test/lib/completions/p4.exp                   | 20 +++++++++++++
 test/lib/completions/paste.exp                | 20 +++++++++++++
 test/lib/completions/patch.exp                | 20 +++++++++++++
 .../perl.exp                                  | 28 ++++++-------------
 test/lib/completions/perldoc.exp              | 20 +++++++++++++
 test/lib/completions/pine.exp                 | 20 +++++++++++++
 test/lib/completions/pkg-config.exp           | 20 +++++++++++++
 test/lib/completions/pkg_deinstall.exp        | 20 +++++++++++++
 test/lib/completions/pkg_delete.exp           | 20 +++++++++++++
 test/lib/completions/pkg_info.exp             | 20 +++++++++++++
 test/lib/completions/portinstall.exp          | 20 +++++++++++++
 test/lib/completions/portupgrade.exp          | 20 +++++++++++++
 test/lib/completions/povray.exp               | 20 +++++++++++++
 test/lib/completions/pr.exp                   | 20 +++++++++++++
 test/lib/completions/psql.exp                 | 20 +++++++++++++
 test/lib/completions/ptx.exp                  | 20 +++++++++++++
 test/lib/completions/pvchange.exp             | 20 +++++++++++++
 test/lib/completions/pvcreate.exp             | 20 +++++++++++++
 test/lib/completions/pvdisplay.exp            | 20 +++++++++++++
 test/lib/completions/pvmove.exp               | 20 +++++++++++++
 test/lib/completions/pvremove.exp             | 20 +++++++++++++
 test/lib/completions/pvs.exp                  | 20 +++++++++++++
 test/lib/completions/pvscan.exp               | 20 +++++++++++++
 test/lib/completions/python.exp               | 20 +++++++++++++
 test/lib/completions_to_review/p4.exp         | 26 -----------------
 test/lib/completions_to_review/paste.exp      | 26 -----------------
 test/lib/completions_to_review/patch.exp      | 26 -----------------
 test/lib/completions_to_review/perldoc.exp    | 26 -----------------
 test/lib/completions_to_review/pine.exp       | 26 -----------------
 test/lib/completions_to_review/pkg-config.exp | 26 -----------------
 .../completions_to_review/pkg_deinstall.exp   | 26 -----------------
 test/lib/completions_to_review/pkg_delete.exp | 26 -----------------
 test/lib/completions_to_review/pkg_info.exp   | 26 -----------------
 .../lib/completions_to_review/portinstall.exp | 26 -----------------
 .../lib/completions_to_review/portupgrade.exp | 26 -----------------
 test/lib/completions_to_review/povray.exp     | 26 -----------------
 test/lib/completions_to_review/pr.exp         | 26 -----------------
 test/lib/completions_to_review/psql.exp       | 26 -----------------
 test/lib/completions_to_review/ptx.exp        | 26 -----------------
 test/lib/completions_to_review/pvchange.exp   | 26 -----------------
 test/lib/completions_to_review/pvcreate.exp   | 26 -----------------
 test/lib/completions_to_review/pvdisplay.exp  | 26 -----------------
 test/lib/completions_to_review/pvmove.exp     | 26 -----------------
 test/lib/completions_to_review/pvremove.exp   | 26 -----------------
 test/lib/completions_to_review/pvs.exp        | 26 -----------------
 test/lib/completions_to_review/pvscan.exp     | 26 -----------------
 test/lib/completions_to_review/python.exp     | 26 -----------------
 87 files changed, 517 insertions(+), 633 deletions(-)
 delete mode 100644 test/_completion_to_review/p4.exp
 delete mode 100644 test/_completion_to_review/paste.exp
 delete mode 100644 test/_completion_to_review/patch.exp
 delete mode 100644 test/_completion_to_review/perl.exp
 delete mode 100644 test/_completion_to_review/perldoc.exp
 delete mode 100644 test/_completion_to_review/pine.exp
 delete mode 100644 test/_completion_to_review/pkg_deinstall.exp
 delete mode 100644 test/_completion_to_review/pkg_delete.exp
 delete mode 100644 test/_completion_to_review/pkg_info.exp
 delete mode 100644 test/_completion_to_review/portinstall.exp
 delete mode 100644 test/_completion_to_review/portupgrade.exp
 delete mode 100644 test/_completion_to_review/povray.exp
 delete mode 100644 test/_completion_to_review/pr.exp
 delete mode 100644 test/_completion_to_review/psql.exp
 delete mode 100644 test/_completion_to_review/ptx.exp
 delete mode 100644 test/_completion_to_review/python.exp
 create mode 100644 test/completion/p4.exp
 create mode 100644 test/completion/paste.exp
 create mode 100644 test/completion/patch.exp
 create mode 100644 test/completion/perl.exp
 create mode 100644 test/completion/perldoc.exp
 create mode 100644 test/completion/pine.exp
 rename test/{_completion_to_review => completion}/pkg-config.exp (100%)
 create mode 100644 test/completion/pkg_deinstall.exp
 create mode 100644 test/completion/pkg_delete.exp
 create mode 100644 test/completion/pkg_info.exp
 create mode 100644 test/completion/portinstall.exp
 create mode 100644 test/completion/portupgrade.exp
 create mode 100644 test/completion/povray.exp
 create mode 100644 test/completion/pr.exp
 create mode 100644 test/completion/psql.exp
 create mode 100644 test/completion/ptx.exp
 rename test/{_completion_to_review => completion}/pvchange.exp (100%)
 rename test/{_completion_to_review => completion}/pvcreate.exp (100%)
 rename test/{_completion_to_review => completion}/pvdisplay.exp (100%)
 rename test/{_completion_to_review => completion}/pvmove.exp (100%)
 rename test/{_completion_to_review => completion}/pvremove.exp (100%)
 rename test/{_completion_to_review => completion}/pvs.exp (100%)
 rename test/{_completion_to_review => completion}/pvscan.exp (100%)
 create mode 100644 test/completion/python.exp
 create mode 100644 test/lib/completions/p4.exp
 create mode 100644 test/lib/completions/paste.exp
 create mode 100644 test/lib/completions/patch.exp
 rename test/lib/{completions_to_review => completions}/perl.exp (64%)
 create mode 100644 test/lib/completions/perldoc.exp
 create mode 100644 test/lib/completions/pine.exp
 create mode 100644 test/lib/completions/pkg-config.exp
 create mode 100644 test/lib/completions/pkg_deinstall.exp
 create mode 100644 test/lib/completions/pkg_delete.exp
 create mode 100644 test/lib/completions/pkg_info.exp
 create mode 100644 test/lib/completions/portinstall.exp
 create mode 100644 test/lib/completions/portupgrade.exp
 create mode 100644 test/lib/completions/povray.exp
 create mode 100644 test/lib/completions/pr.exp
 create mode 100644 test/lib/completions/psql.exp
 create mode 100644 test/lib/completions/ptx.exp
 create mode 100644 test/lib/completions/pvchange.exp
 create mode 100644 test/lib/completions/pvcreate.exp
 create mode 100644 test/lib/completions/pvdisplay.exp
 create mode 100644 test/lib/completions/pvmove.exp
 create mode 100644 test/lib/completions/pvremove.exp
 create mode 100644 test/lib/completions/pvs.exp
 create mode 100644 test/lib/completions/pvscan.exp
 create mode 100644 test/lib/completions/python.exp
 delete mode 100644 test/lib/completions_to_review/p4.exp
 delete mode 100644 test/lib/completions_to_review/paste.exp
 delete mode 100644 test/lib/completions_to_review/patch.exp
 delete mode 100644 test/lib/completions_to_review/perldoc.exp
 delete mode 100644 test/lib/completions_to_review/pine.exp
 delete mode 100644 test/lib/completions_to_review/pkg-config.exp
 delete mode 100644 test/lib/completions_to_review/pkg_deinstall.exp
 delete mode 100644 test/lib/completions_to_review/pkg_delete.exp
 delete mode 100644 test/lib/completions_to_review/pkg_info.exp
 delete mode 100644 test/lib/completions_to_review/portinstall.exp
 delete mode 100644 test/lib/completions_to_review/portupgrade.exp
 delete mode 100644 test/lib/completions_to_review/povray.exp
 delete mode 100644 test/lib/completions_to_review/pr.exp
 delete mode 100644 test/lib/completions_to_review/psql.exp
 delete mode 100644 test/lib/completions_to_review/ptx.exp
 delete mode 100644 test/lib/completions_to_review/pvchange.exp
 delete mode 100644 test/lib/completions_to_review/pvcreate.exp
 delete mode 100644 test/lib/completions_to_review/pvdisplay.exp
 delete mode 100644 test/lib/completions_to_review/pvmove.exp
 delete mode 100644 test/lib/completions_to_review/pvremove.exp
 delete mode 100644 test/lib/completions_to_review/pvs.exp
 delete mode 100644 test/lib/completions_to_review/pvscan.exp
 delete mode 100644 test/lib/completions_to_review/python.exp

diff --git a/test/_completion_to_review/p4.exp b/test/_completion_to_review/p4.exp
deleted file mode 100644
index 7de48de3..00000000
--- a/test/_completion_to_review/p4.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/p4.exp"
diff --git a/test/_completion_to_review/paste.exp b/test/_completion_to_review/paste.exp
deleted file mode 100644
index 017e25f6..00000000
--- a/test/_completion_to_review/paste.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/paste.exp"
diff --git a/test/_completion_to_review/patch.exp b/test/_completion_to_review/patch.exp
deleted file mode 100644
index 69a49701..00000000
--- a/test/_completion_to_review/patch.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/patch.exp"
diff --git a/test/_completion_to_review/perl.exp b/test/_completion_to_review/perl.exp
deleted file mode 100644
index a7817b3c..00000000
--- a/test/_completion_to_review/perl.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/perl.exp"
diff --git a/test/_completion_to_review/perldoc.exp b/test/_completion_to_review/perldoc.exp
deleted file mode 100644
index 526e1440..00000000
--- a/test/_completion_to_review/perldoc.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/perldoc.exp"
diff --git a/test/_completion_to_review/pine.exp b/test/_completion_to_review/pine.exp
deleted file mode 100644
index 414bd3ac..00000000
--- a/test/_completion_to_review/pine.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/pine.exp"
diff --git a/test/_completion_to_review/pkg_deinstall.exp b/test/_completion_to_review/pkg_deinstall.exp
deleted file mode 100644
index bc721beb..00000000
--- a/test/_completion_to_review/pkg_deinstall.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/pkg_deinstall.exp"
diff --git a/test/_completion_to_review/pkg_delete.exp b/test/_completion_to_review/pkg_delete.exp
deleted file mode 100644
index e43d50e3..00000000
--- a/test/_completion_to_review/pkg_delete.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/pkg_delete.exp"
diff --git a/test/_completion_to_review/pkg_info.exp b/test/_completion_to_review/pkg_info.exp
deleted file mode 100644
index 54cd1b7b..00000000
--- a/test/_completion_to_review/pkg_info.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/pkg_info.exp"
diff --git a/test/_completion_to_review/portinstall.exp b/test/_completion_to_review/portinstall.exp
deleted file mode 100644
index fd223e5c..00000000
--- a/test/_completion_to_review/portinstall.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/portinstall.exp"
diff --git a/test/_completion_to_review/portupgrade.exp b/test/_completion_to_review/portupgrade.exp
deleted file mode 100644
index 22e50cfa..00000000
--- a/test/_completion_to_review/portupgrade.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/portupgrade.exp"
diff --git a/test/_completion_to_review/povray.exp b/test/_completion_to_review/povray.exp
deleted file mode 100644
index bf7688a3..00000000
--- a/test/_completion_to_review/povray.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/povray.exp"
diff --git a/test/_completion_to_review/pr.exp b/test/_completion_to_review/pr.exp
deleted file mode 100644
index 3f08a619..00000000
--- a/test/_completion_to_review/pr.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/pr.exp"
diff --git a/test/_completion_to_review/psql.exp b/test/_completion_to_review/psql.exp
deleted file mode 100644
index 0fcc8c8f..00000000
--- a/test/_completion_to_review/psql.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/psql.exp"
diff --git a/test/_completion_to_review/ptx.exp b/test/_completion_to_review/ptx.exp
deleted file mode 100644
index 000594f5..00000000
--- a/test/_completion_to_review/ptx.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/ptx.exp"
diff --git a/test/_completion_to_review/python.exp b/test/_completion_to_review/python.exp
deleted file mode 100644
index 18cee883..00000000
--- a/test/_completion_to_review/python.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/python.exp"
diff --git a/test/completion/p4.exp b/test/completion/p4.exp
new file mode 100644
index 00000000..d261ee09
--- /dev/null
+++ b/test/completion/p4.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type p4]} {
+    source "lib/completions/p4.exp"
+}; # if
diff --git a/test/completion/paste.exp b/test/completion/paste.exp
new file mode 100644
index 00000000..3358b9f3
--- /dev/null
+++ b/test/completion/paste.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type paste]} {
+    source "lib/completions/paste.exp"
+}; # if
diff --git a/test/completion/patch.exp b/test/completion/patch.exp
new file mode 100644
index 00000000..a8b9b76e
--- /dev/null
+++ b/test/completion/patch.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type patch]} {
+    source "lib/completions/patch.exp"
+}; # if
diff --git a/test/completion/perl.exp b/test/completion/perl.exp
new file mode 100644
index 00000000..496d4db1
--- /dev/null
+++ b/test/completion/perl.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type {perl}]} {
+    source "lib/completions/perl.exp"
+}; # if
diff --git a/test/completion/perldoc.exp b/test/completion/perldoc.exp
new file mode 100644
index 00000000..31162522
--- /dev/null
+++ b/test/completion/perldoc.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type perldoc]} {
+    source "lib/completions/perldoc.exp"
+}; # if
diff --git a/test/completion/pine.exp b/test/completion/pine.exp
new file mode 100644
index 00000000..108b0ccc
--- /dev/null
+++ b/test/completion/pine.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type pine]} {
+    source "lib/completions/pine.exp"
+}; # if
diff --git a/test/_completion_to_review/pkg-config.exp b/test/completion/pkg-config.exp
similarity index 100%
rename from test/_completion_to_review/pkg-config.exp
rename to test/completion/pkg-config.exp
diff --git a/test/completion/pkg_deinstall.exp b/test/completion/pkg_deinstall.exp
new file mode 100644
index 00000000..67b0a7e2
--- /dev/null
+++ b/test/completion/pkg_deinstall.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type pkg_deinstall]} {
+    source "lib/completions/pkg_deinstall.exp"
+}; # if
diff --git a/test/completion/pkg_delete.exp b/test/completion/pkg_delete.exp
new file mode 100644
index 00000000..d90eca2c
--- /dev/null
+++ b/test/completion/pkg_delete.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type pkg_delete]} {
+    source "lib/completions/pkg_delete.exp"
+}; # if
diff --git a/test/completion/pkg_info.exp b/test/completion/pkg_info.exp
new file mode 100644
index 00000000..1a7fe000
--- /dev/null
+++ b/test/completion/pkg_info.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type pkg_info]} {
+    source "lib/completions/pkg_info.exp"
+}; # if
diff --git a/test/completion/portinstall.exp b/test/completion/portinstall.exp
new file mode 100644
index 00000000..fa6fc8b7
--- /dev/null
+++ b/test/completion/portinstall.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type portinstall]} {
+    source "lib/completions/portinstall.exp"
+}; # if
diff --git a/test/completion/portupgrade.exp b/test/completion/portupgrade.exp
new file mode 100644
index 00000000..bc2e8576
--- /dev/null
+++ b/test/completion/portupgrade.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type portupgrade]} {
+    source "lib/completions/portupgrade.exp"
+}; # if
diff --git a/test/completion/povray.exp b/test/completion/povray.exp
new file mode 100644
index 00000000..0c50f4fd
--- /dev/null
+++ b/test/completion/povray.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type povray]} {
+    source "lib/completions/povray.exp"
+}; # if
diff --git a/test/completion/pr.exp b/test/completion/pr.exp
new file mode 100644
index 00000000..de0884ad
--- /dev/null
+++ b/test/completion/pr.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type pr]} {
+    source "lib/completions/pr.exp"
+}; # if
diff --git a/test/completion/psql.exp b/test/completion/psql.exp
new file mode 100644
index 00000000..86a3f297
--- /dev/null
+++ b/test/completion/psql.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type psql]} {
+    source "lib/completions/psql.exp"
+}; # if
diff --git a/test/completion/ptx.exp b/test/completion/ptx.exp
new file mode 100644
index 00000000..75656a96
--- /dev/null
+++ b/test/completion/ptx.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type ptx]} {
+    source "lib/completions/ptx.exp"
+}; # if
diff --git a/test/_completion_to_review/pvchange.exp b/test/completion/pvchange.exp
similarity index 100%
rename from test/_completion_to_review/pvchange.exp
rename to test/completion/pvchange.exp
diff --git a/test/_completion_to_review/pvcreate.exp b/test/completion/pvcreate.exp
similarity index 100%
rename from test/_completion_to_review/pvcreate.exp
rename to test/completion/pvcreate.exp
diff --git a/test/_completion_to_review/pvdisplay.exp b/test/completion/pvdisplay.exp
similarity index 100%
rename from test/_completion_to_review/pvdisplay.exp
rename to test/completion/pvdisplay.exp
diff --git a/test/_completion_to_review/pvmove.exp b/test/completion/pvmove.exp
similarity index 100%
rename from test/_completion_to_review/pvmove.exp
rename to test/completion/pvmove.exp
diff --git a/test/_completion_to_review/pvremove.exp b/test/completion/pvremove.exp
similarity index 100%
rename from test/_completion_to_review/pvremove.exp
rename to test/completion/pvremove.exp
diff --git a/test/_completion_to_review/pvs.exp b/test/completion/pvs.exp
similarity index 100%
rename from test/_completion_to_review/pvs.exp
rename to test/completion/pvs.exp
diff --git a/test/_completion_to_review/pvscan.exp b/test/completion/pvscan.exp
similarity index 100%
rename from test/_completion_to_review/pvscan.exp
rename to test/completion/pvscan.exp
diff --git a/test/completion/python.exp b/test/completion/python.exp
new file mode 100644
index 00000000..fd44bfbe
--- /dev/null
+++ b/test/completion/python.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type python]} {
+    source "lib/completions/python.exp"
+}; # if
diff --git a/test/lib/completions/p4.exp b/test/lib/completions/p4.exp
new file mode 100644
index 00000000..369d2c6b
--- /dev/null
+++ b/test/lib/completions/p4.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "p4 "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/paste.exp b/test/lib/completions/paste.exp
new file mode 100644
index 00000000..3a4e93be
--- /dev/null
+++ b/test/lib/completions/paste.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "paste "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/patch.exp b/test/lib/completions/patch.exp
new file mode 100644
index 00000000..a44fa130
--- /dev/null
+++ b/test/lib/completions/patch.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "patch "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions_to_review/perl.exp b/test/lib/completions/perl.exp
similarity index 64%
rename from test/lib/completions_to_review/perl.exp
rename to test/lib/completions/perl.exp
index 8e61e2d4..4b463383 100644
--- a/test/lib/completions_to_review/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -1,23 +1,17 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()
 
 
 setup
 
 
-set test "Tab should show completions"
-    # Try completion
-set cmd "perl "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*\r\n/@$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
+assert_complete_any "perl "
 
 
 sync_after_int
@@ -40,7 +34,7 @@ set test "-I without space should complete directories"
 set cmd "perl -Ifixture1/"
 send "$cmd\t"
 expect {
-    -re "^$cmd\r\n(\.svn/ +|)bar bar.d/ +foo.d/ *(\.svn/ *|)\r\n/@$cmd$" { pass "$test" }
+    -re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
 }
@@ -53,7 +47,7 @@ set test "-I with space should complete directories"
 set cmd "perl -I fixture1/"
 send "$cmd\t"
 expect {
-    -re "^$cmd\r\n(\.svn/ +|)bar bar.d/ +foo.d/ *(\.svn/ *|)\r\n/@$cmd$" { pass "$test" }
+    -re "^$cmd\r\nbar bar.d/ +foo.d/ *\r\n/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
 }
@@ -89,14 +83,10 @@ sync_after_int
 
 
 set test "- should complete options"
-    # Try completion
-set cmd "perl -"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n-0 +-a +-c +-C +-d +-D +-e +-F +-h +-i +-I +-l +-m +-M +-n +-p +-P +-s +-S +-T +-u +-U +-v +-V +-w +-W +-x +-X\r\n/@$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
+set options {
+    -0 -a -c -C -d -D -e -F -h -i -I -l -m -M -n -p -P -s -S -T -u -U -v -V -w -W -x -X
+}
+assert_complete $options "perl -"
 
 
 sync_after_int
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
new file mode 100644
index 00000000..01eab998
--- /dev/null
+++ b/test/lib/completions/perldoc.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "perldoc -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pine.exp b/test/lib/completions/pine.exp
new file mode 100644
index 00000000..0a0c3f40
--- /dev/null
+++ b/test/lib/completions/pine.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pine "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkg-config.exp b/test/lib/completions/pkg-config.exp
new file mode 100644
index 00000000..477dba08
--- /dev/null
+++ b/test/lib/completions/pkg-config.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pkg-config -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkg_deinstall.exp b/test/lib/completions/pkg_deinstall.exp
new file mode 100644
index 00000000..fffc5024
--- /dev/null
+++ b/test/lib/completions/pkg_deinstall.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pkg_deinstall "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkg_delete.exp b/test/lib/completions/pkg_delete.exp
new file mode 100644
index 00000000..b0c1a2a5
--- /dev/null
+++ b/test/lib/completions/pkg_delete.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pkg_delete "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkg_info.exp b/test/lib/completions/pkg_info.exp
new file mode 100644
index 00000000..3f253ccf
--- /dev/null
+++ b/test/lib/completions/pkg_info.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pkg_info "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/portinstall.exp b/test/lib/completions/portinstall.exp
new file mode 100644
index 00000000..677ac657
--- /dev/null
+++ b/test/lib/completions/portinstall.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "portinstall "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/portupgrade.exp b/test/lib/completions/portupgrade.exp
new file mode 100644
index 00000000..e80281b4
--- /dev/null
+++ b/test/lib/completions/portupgrade.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "portupgrade "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/povray.exp b/test/lib/completions/povray.exp
new file mode 100644
index 00000000..1efeeddb
--- /dev/null
+++ b/test/lib/completions/povray.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "povray "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pr.exp b/test/lib/completions/pr.exp
new file mode 100644
index 00000000..5d7a96c3
--- /dev/null
+++ b/test/lib/completions/pr.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pr "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/psql.exp b/test/lib/completions/psql.exp
new file mode 100644
index 00000000..56d56666
--- /dev/null
+++ b/test/lib/completions/psql.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "psql -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ptx.exp b/test/lib/completions/ptx.exp
new file mode 100644
index 00000000..2defe049
--- /dev/null
+++ b/test/lib/completions/ptx.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ptx "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvchange.exp b/test/lib/completions/pvchange.exp
new file mode 100644
index 00000000..fd4b73d0
--- /dev/null
+++ b/test/lib/completions/pvchange.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvchange --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvcreate.exp b/test/lib/completions/pvcreate.exp
new file mode 100644
index 00000000..47cebf7a
--- /dev/null
+++ b/test/lib/completions/pvcreate.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvcreate --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvdisplay.exp b/test/lib/completions/pvdisplay.exp
new file mode 100644
index 00000000..151064cd
--- /dev/null
+++ b/test/lib/completions/pvdisplay.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvdisplay --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvmove.exp b/test/lib/completions/pvmove.exp
new file mode 100644
index 00000000..81c05e98
--- /dev/null
+++ b/test/lib/completions/pvmove.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvmove --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvremove.exp b/test/lib/completions/pvremove.exp
new file mode 100644
index 00000000..dd145bf6
--- /dev/null
+++ b/test/lib/completions/pvremove.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvremove --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvs.exp b/test/lib/completions/pvs.exp
new file mode 100644
index 00000000..6e5527e1
--- /dev/null
+++ b/test/lib/completions/pvs.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvs --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pvscan.exp b/test/lib/completions/pvscan.exp
new file mode 100644
index 00000000..e92cdbe0
--- /dev/null
+++ b/test/lib/completions/pvscan.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "pvscan --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/python.exp b/test/lib/completions/python.exp
new file mode 100644
index 00000000..c9d70b43
--- /dev/null
+++ b/test/lib/completions/python.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "python "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions_to_review/p4.exp b/test/lib/completions_to_review/p4.exp
deleted file mode 100644
index 1b26cfca..00000000
--- a/test/lib/completions_to_review/p4.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "p4 "
-send "$cmd\t"
-expect {
-    -re "^${cmd}(bash: p4: command not found|)\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/paste.exp b/test/lib/completions_to_review/paste.exp
deleted file mode 100644
index 5d6c3c85..00000000
--- a/test/lib/completions_to_review/paste.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "paste "
-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
diff --git a/test/lib/completions_to_review/patch.exp b/test/lib/completions_to_review/patch.exp
deleted file mode 100644
index c3015c11..00000000
--- a/test/lib/completions_to_review/patch.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "patch "
-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
diff --git a/test/lib/completions_to_review/perldoc.exp b/test/lib/completions_to_review/perldoc.exp
deleted file mode 100644
index ac8a18f8..00000000
--- a/test/lib/completions_to_review/perldoc.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "perldoc -"
-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
diff --git a/test/lib/completions_to_review/pine.exp b/test/lib/completions_to_review/pine.exp
deleted file mode 100644
index cb4396c3..00000000
--- a/test/lib/completions_to_review/pine.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pine "
-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
diff --git a/test/lib/completions_to_review/pkg-config.exp b/test/lib/completions_to_review/pkg-config.exp
deleted file mode 100644
index 67094dd6..00000000
--- a/test/lib/completions_to_review/pkg-config.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pkg-config -"
-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
diff --git a/test/lib/completions_to_review/pkg_deinstall.exp b/test/lib/completions_to_review/pkg_deinstall.exp
deleted file mode 100644
index 700a5bea..00000000
--- a/test/lib/completions_to_review/pkg_deinstall.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pkg_deinstall "
-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
diff --git a/test/lib/completions_to_review/pkg_delete.exp b/test/lib/completions_to_review/pkg_delete.exp
deleted file mode 100644
index fc82066e..00000000
--- a/test/lib/completions_to_review/pkg_delete.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pkg_delete "
-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
diff --git a/test/lib/completions_to_review/pkg_info.exp b/test/lib/completions_to_review/pkg_info.exp
deleted file mode 100644
index 66bc0e16..00000000
--- a/test/lib/completions_to_review/pkg_info.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pkg_info "
-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
diff --git a/test/lib/completions_to_review/portinstall.exp b/test/lib/completions_to_review/portinstall.exp
deleted file mode 100644
index 36a6f0b0..00000000
--- a/test/lib/completions_to_review/portinstall.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "portinstall "
-send "$cmd\t"
-expect {
-    -re "^${cmd}(bash: /usr/ports//INDEX: No such file or directory\r\n)*\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/portupgrade.exp b/test/lib/completions_to_review/portupgrade.exp
deleted file mode 100644
index b345f1a3..00000000
--- a/test/lib/completions_to_review/portupgrade.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "portupgrade "
-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
diff --git a/test/lib/completions_to_review/povray.exp b/test/lib/completions_to_review/povray.exp
deleted file mode 100644
index bada2cc6..00000000
--- a/test/lib/completions_to_review/povray.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "povray "
-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
diff --git a/test/lib/completions_to_review/pr.exp b/test/lib/completions_to_review/pr.exp
deleted file mode 100644
index a7f4f57d..00000000
--- a/test/lib/completions_to_review/pr.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pr "
-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
diff --git a/test/lib/completions_to_review/psql.exp b/test/lib/completions_to_review/psql.exp
deleted file mode 100644
index 19f5a8a5..00000000
--- a/test/lib/completions_to_review/psql.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "psql "
-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
diff --git a/test/lib/completions_to_review/ptx.exp b/test/lib/completions_to_review/ptx.exp
deleted file mode 100644
index 95c93443..00000000
--- a/test/lib/completions_to_review/ptx.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "ptx "
-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
diff --git a/test/lib/completions_to_review/pvchange.exp b/test/lib/completions_to_review/pvchange.exp
deleted file mode 100644
index 190ee415..00000000
--- a/test/lib/completions_to_review/pvchange.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvchange --"
-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
diff --git a/test/lib/completions_to_review/pvcreate.exp b/test/lib/completions_to_review/pvcreate.exp
deleted file mode 100644
index 795c8f23..00000000
--- a/test/lib/completions_to_review/pvcreate.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvcreate --"
-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
diff --git a/test/lib/completions_to_review/pvdisplay.exp b/test/lib/completions_to_review/pvdisplay.exp
deleted file mode 100644
index e10fbe0e..00000000
--- a/test/lib/completions_to_review/pvdisplay.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvdisplay --"
-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
diff --git a/test/lib/completions_to_review/pvmove.exp b/test/lib/completions_to_review/pvmove.exp
deleted file mode 100644
index 9c0f70e4..00000000
--- a/test/lib/completions_to_review/pvmove.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvmove --"
-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
diff --git a/test/lib/completions_to_review/pvremove.exp b/test/lib/completions_to_review/pvremove.exp
deleted file mode 100644
index cb89bd2f..00000000
--- a/test/lib/completions_to_review/pvremove.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvremove --"
-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
diff --git a/test/lib/completions_to_review/pvs.exp b/test/lib/completions_to_review/pvs.exp
deleted file mode 100644
index a8a5758b..00000000
--- a/test/lib/completions_to_review/pvs.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvs --"
-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
diff --git a/test/lib/completions_to_review/pvscan.exp b/test/lib/completions_to_review/pvscan.exp
deleted file mode 100644
index 7ffb4847..00000000
--- a/test/lib/completions_to_review/pvscan.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "pvscan --"
-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
diff --git a/test/lib/completions_to_review/python.exp b/test/lib/completions_to_review/python.exp
deleted file mode 100644
index 0889d43f..00000000
--- a/test/lib/completions_to_review/python.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "python "
-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