[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-364-gd44aaed

[Igor Murzov]

The following commit has been merged in the master branch:
commit d44aaed16a1dd2cf6343f3ea409a2f98ce689c1a
Author: Igor Murzov <e-mail at date.by>
Date:   Sun Jun 12 18:34:38 2011 +0400

    testsuite: Improve slapt-get/slapt-src tests.

diff --git a/test/fixtures/_filedir/a b/i b/test/fixtures/slackware/etc/slapt-get/slapt-getrc
similarity index 100%
copy from test/fixtures/_filedir/a b/i
copy to test/fixtures/slackware/etc/slapt-get/slapt-getrc
diff --git a/test/fixtures/_filedir/a b/i b/test/fixtures/slackware/etc/slapt-get/slapt-srcrc
similarity index 100%
copy from test/fixtures/_filedir/a b/i
copy to test/fixtures/slackware/etc/slapt-get/slapt-srcrc
diff --git a/test/fixtures/slackware/usr/src/slapt-src/slackbuilds_data b/test/fixtures/slackware/usr/src/slapt-src/slackbuilds_data
new file mode 100644
index 0000000..0f4ee44
--- /dev/null
+++ b/test/fixtures/slackware/usr/src/slapt-src/slackbuilds_data
@@ -0,0 +1,20 @@
+SLACKBUILD NAME: abc
+SLACKBUILD SOURCEURL: http://www.slackware.org.uk/slackbuilds.org/13.37/
+SLACKBUILD LOCATION: libraries/abc/
+SLACKBUILD FILES: abc.SlackBuild slack-desc
+SLACKBUILD VERSION: 4
+SLACKBUILD DOWNLOAD: http://www.ufl.edu/abc-4.tar.gz
+SLACKBUILD MD5SUM: b3e9679ba20635ac4847f01c01d6e992
+SLACKBUILD REQUIRES: 
+SLACKBUILD SHORT DESCRIPTION: abc is a small utility
+
+SLACKBUILD NAME: qwe
+SLACKBUILD SOURCEURL: http://www.slackware.org.uk/slackbuilds.org/13.37/
+SLACKBUILD LOCATION: network/qwe/
+SLACKBUILD FILES: qwe.SlackBuild
+SLACKBUILD VERSION: 2.1
+SLACKBUILD DOWNLOAD: http://php.net/qwe-2.1.tgz
+SLACKBUILD MD5SUM: 1f7a58f850e795b0958a3f99ae8c2cc4
+SLACKBUILD REQUIRES: 
+SLACKBUILD SHORT DESCRIPTION: qwe is a program
+
diff --git a/test/fixtures/slackware/var/slapt-get/package_data b/test/fixtures/slackware/var/slapt-get/package_data
new file mode 100644
index 0000000..410fc3d
--- /dev/null
+++ b/test/fixtures/slackware/var/slapt-get/package_data
@@ -0,0 +1,47 @@
+PACKAGE NAME:  abc-4-i686-1.txz
+PACKAGE MIRROR:  http://slackware.com/
+PACKAGE PRIORITY:  2
+PACKAGE LOCATION:  ./slackware/ap
+PACKAGE SIZE (compressed):  48 K
+PACKAGE SIZE (uncompressed):  150 K
+PACKAGE REQUIRED:  
+PACKAGE CONFLICTS:  
+PACKAGE SUGGESTS:  
+PACKAGE MD5SUM:  53e873df10b9e343a5c58721f10b9131
+PACKAGE DESCRIPTION:
+abc: abc (small utility)
+abc:
+abc: abc is a small utility
+abc:
+
+PACKAGE NAME:  ran-1.2-noarch-1.txz
+PACKAGE MIRROR:  http://slackware.com/
+PACKAGE PRIORITY:  2
+PACKAGE LOCATION:  ./slackware/x
+PACKAGE SIZE (compressed):  36 K
+PACKAGE SIZE (uncompressed):  160 K
+PACKAGE REQUIRED:  
+PACKAGE CONFLICTS:  
+PACKAGE SUGGESTS:  
+PACKAGE MD5SUM:  cefa3f087e10f8371d68bea94a829ef8
+PACKAGE DESCRIPTION:
+ran: ran
+ran:
+ran: ran is part of X11.
+ran:
+
+PACKAGE NAME:  qwe-2.1-i486-1.txz
+PACKAGE MIRROR:  http://slackware.com/
+PACKAGE PRIORITY:  1
+PACKAGE LOCATION:  ./slackware/ap
+PACKAGE SIZE (compressed):  20 K
+PACKAGE SIZE (uncompressed):  50 K
+PACKAGE REQUIRED:  
+PACKAGE CONFLICTS:  
+PACKAGE SUGGESTS:  
+PACKAGE MD5SUM:  1a8fe22cb924cde3dc95c89689b20ee3
+PACKAGE DESCRIPTION:
+qwe: qwe
+qwe:
+qwe: qwe is a program
+qwe:
diff --git a/test/lib/completions/slapt-get.exp b/test/lib/completions/slapt-get.exp
index 0cb0d3d..70afc66 100644
--- a/test/lib/completions/slapt-get.exp
+++ b/test/lib/completions/slapt-get.exp
@@ -17,4 +17,30 @@ assert_complete_any "slapt-get -"
 sync_after_int
 
 
+set test "--up<TAB> should complete \"--update --upgrade\""
+assert_complete "--update --upgrade" "slapt-get --up" $test
+
+
+sync_after_int
+
+
+
+set test "--install should complete available packages"
+set config $::srcdir/fixtures/slackware/etc/slapt-get/slapt-getrc
+set workdir [file normalize $::srcdir/fixtures/slackware/var/slapt-get/]
+set pkg_data "$workdir/package_data"
+# write simple config
+set f [open $config w]
+puts $f "WORKINGDIR=$workdir"
+puts $f "SOURCE=file:///home/"
+close $f
+set packages [split [exec bash -c "sed -n \
+      '/^PACKAGE NAME:/{s/^PACKAGE NAME: \\{1,\\}\\(.*\\).t\[gbxl\]z/\\1/;p}' \
+      $pkg_data"] "\n"]
+assert_complete $packages "slapt-get -c $config --install " $test
+
+
+sync_after_int
+
+
 teardown
diff --git a/test/lib/completions/slapt-src.exp b/test/lib/completions/slapt-src.exp
index ff1339c..9410f9c 100644
--- a/test/lib/completions/slapt-src.exp
+++ b/test/lib/completions/slapt-src.exp
@@ -17,4 +17,33 @@ assert_complete_any "slapt-src -"
 sync_after_int
 
 
+set test "--bu<TAB> should complete \"--build\""
+assert_complete "--build" "slapt-src --bu" $test
+
+
+sync_after_int
+
+
+set test "--ins<TAB> should complete \"--install\""
+assert_complete "--install" "slapt-src --ins" $test
+
+
+sync_after_int
+
+
+set test "--install should complete available packages"
+set config $::srcdir/fixtures/slackware/etc/slapt-get/slapt-srcrc
+set workdir [file normalize $::srcdir/fixtures/slackware/usr/src/slapt-src/]
+set slb_data "$workdir/slackbuilds_data"
+set f [open $config w]; puts $f "BUILDDIR=$workdir"; close $f
+set slackbuilds [split [exec bash -c "sed -n \
+        -e '/^SLACKBUILD NAME: /{s/^SLACKBUILD NAME: \\{1,\\}//;p}' \
+        -e '/^SLACKBUILD VERSION: /{s/^SLACKBUILD VERSION: \\{1,\\}//;p}' \
+        $slb_data | sed -e 'N;s/\\n/:/'"] "\n"]
+assert_complete $slackbuilds "slapt-src --config $config --install " $test
+
+
+sync_after_int
+
+
 teardown

-- 
bash-completion