diff options
| author | Jeff Bilyk <jbilyk@gmail.com> | 2010-12-11 20:25:50 +0000 |
|---|---|---|
| committer | Jeff Bilyk <jbilyk@gmail.com> | 2010-12-11 20:25:50 +0000 |
| commit | d7449ca02ee7334279ba7d4ca769ff7f57a48a60 (patch) | |
| tree | b3f1ec69b00832905063340e4f0420ce89799bb3 | |
| parent | a56e0285359040b3024c373bb6f702556e1a6d60 (diff) | |
| download | apts-d7449ca02ee7334279ba7d4ca769ff7f57a48a60.tar.bz2 apts-d7449ca02ee7334279ba7d4ca769ff7f57a48a60.tar.xz | |
apts: add more tests and fix typos and multiple package testing
Add tests and fix issue when testing multiple packages at once
| -rwxr-xr-x | apts | 10 | ||||
| -rw-r--r-- | test.rar | bin | 0 -> 91 bytes | |||
| -rw-r--r-- | tests/acl | 2 | ||||
| -rw-r--r-- | tests/bind | 10 | ||||
| -rw-r--r-- | tests/bind-tools | 1 | ||||
| -rw-r--r-- | tests/bzip2 | 3 | ||||
| -rw-r--r-- | tests/cdrkit | 5 | ||||
| -rw-r--r-- | tests/cgit | 3 | ||||
| -rw-r--r-- | tests/chrony | 16 | ||||
| -rw-r--r-- | tests/clamav | 4 | ||||
| -rw-r--r-- | tests/cutter | 4 | ||||
| -rw-r--r-- | tests/cvs | 3 | ||||
| -rw-r--r-- | tests/file | 3 | ||||
| -rw-r--r-- | tests/findutils | 4 | ||||
| -rw-r--r-- | tests/flac | 3 | ||||
| -rw-r--r-- | tests/fprobe | 3 | ||||
| -rw-r--r-- | tests/gdb | 3 | ||||
| -rw-r--r-- | tests/generic-apk | 3 | ||||
| -rw-r--r-- | tests/git | 9 | ||||
| -rw-r--r-- | tests/grep | 4 | ||||
| -rw-r--r-- | tests/iptraf | 2 | ||||
| -rw-r--r-- | tests/ircii | 3 | ||||
| -rw-r--r-- | tests/less | 4 | ||||
| -rw-r--r-- | tests/links | 3 | ||||
| -rw-r--r-- | tests/lm_sensors | 4 | ||||
| -rw-r--r-- | tests/nano | 3 | ||||
| -rw-r--r-- | tests/patch | 3 | ||||
| -rw-r--r-- | tests/php | 6 | ||||
| -rw-r--r-- | tests/pmacct | 11 | ||||
| -rw-r--r-- | tests/pwgen | 3 | ||||
| -rw-r--r-- | tests/rrdtool | 3 | ||||
| -rw-r--r-- | tests/smartmontools | 3 | ||||
| -rw-r--r-- | tests/strace | 3 | ||||
| -rw-r--r-- | tests/sudo | 3 | ||||
| -rw-r--r-- | tests/tar | 4 | ||||
| -rw-r--r-- | tests/tcl | 3 | ||||
| -rw-r--r-- | tests/tcpdump | 3 | ||||
| -rw-r--r-- | tests/testdisk | 3 | ||||
| -rw-r--r-- | tests/tinc | 3 | ||||
| -rw-r--r-- | tests/unrar | 3 | ||||
| -rw-r--r-- | tests/vim | 5 | ||||
| -rw-r--r-- | tests/vlc | 4 | ||||
| -rw-r--r-- | tests/vsftpd | 10 | ||||
| -rw-r--r-- | tests/wget | 4 | ||||
| -rw-r--r-- | tests/wireless-tools | 4 | ||||
| -rw-r--r-- | tests/wireshark | 3 | ||||
| -rw-r--r-- | torvalds-says-linux.mp3 | bin | 0 -> 82969 bytes |
47 files changed, 178 insertions, 18 deletions
@@ -40,9 +40,9 @@ shift # if there aren't any args besides outfile test all packages if [ $# -eq 0 ]; - then echo "All packages to be tested" && for package in `ls ./tests`; - do echo "Testing $1 apk" && /bin/sh -e ./tests/$1 >> "$OUTFILE" 2>&1 && echo "$1 passed tests" >> "$OUTFILE" && echo "$1 passed tests"; - done && exit 0; + then totaltests=`ls ./tests/ | wc -w` && echo "All (${totaltests}) packages to be tested" && passedtests="0" && for package in `ls ./tests/`; + do echo "Testing $package apk" && /bin/sh -e ./tests/$package $package >> "$OUTFILE" 2>&1 && echo "$package passed tests" >> "$OUTFILE" && echo "$package passed tests" && passedtests=$((passedtests + 1)); + done && echo "$passedtests of $totaltests passed" && exit 0; fi # If script still running, there's args, so test all specified packages @@ -54,9 +54,9 @@ while [ $# -gt 0 ]; do test -e ./tests/$PACKAGE # If no testing file exists then run generic-apk if [ "$?" == "1" ]; - then echo "Testing file for $PACKAGE does not exist" && /bin/sh -e ./tests/generic-apk >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; + then echo "Testing file for $PACKAGE does not exist" && /bin/sh -e ./tests/generic-apk $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; # if testing file exists, then keep running - else echo "Testing $PACKAGE apk" && /bin/sh -e ./tests/$PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; + else echo "Testing $PACKAGE apk" && /bin/sh -e ./tests/$PACKAGE $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; fi i=$(( $i + 1 )) shift diff --git a/test.rar b/test.rar Binary files differnew file mode 100644 index 0000000..a290889 --- /dev/null +++ b/test.rar @@ -1,3 +1,3 @@ apk_add $@ getfacl . - apk_del -R $@ + apk_del $@ diff --git a/tests/bind b/tests/bind new file mode 100644 index 0000000..6911209 --- /dev/null +++ b/tests/bind @@ -0,0 +1,10 @@ + apk_add bind bind-tools + /etc/init.d/named start + pidof named + dig @127.0.0.1 + /etc/init.d/named stop + while pidof bind; do\ + echo -n "." >/dev/tty;\ + sleep 1;\ + done + apk_del bind bind-tools diff --git a/tests/bind-tools b/tests/bind-tools new file mode 100644 index 0000000..73c36bc --- /dev/null +++ b/tests/bind-tools @@ -0,0 +1 @@ +. tests/bind diff --git a/tests/bzip2 b/tests/bzip2 new file mode 100644 index 0000000..f109c04 --- /dev/null +++ b/tests/bzip2 @@ -0,0 +1,3 @@ + apk_add $@ + echo "hello world" | bzip2 -c >/dev/null + apk_del $@ diff --git a/tests/cdrkit b/tests/cdrkit new file mode 100644 index 0000000..332d9bf --- /dev/null +++ b/tests/cdrkit @@ -0,0 +1,5 @@ + apk_add $@ + mkdir test-cdrkit + echo hello > test-cdrkit/foo + genisoimage test-cdrkit > test.iso + apk_del $@ diff --git a/tests/cgit b/tests/cgit new file mode 100644 index 0000000..f7f8675 --- /dev/null +++ b/tests/cgit @@ -0,0 +1,3 @@ + apk_add $@ + /usr/share/webapps/cgit/cgit.cgi + apk_del $@ diff --git a/tests/chrony b/tests/chrony new file mode 100644 index 0000000..e463f44 --- /dev/null +++ b/tests/chrony @@ -0,0 +1,16 @@ + INITD=chronyd + CONF="/etc/chrony/chrony.conf" + apk_add $@ + echo "server pool.ntp.org" > $CONF + echo "keyfile /etc/chrony/chrony.keys" >> $CONF + echo "commandkey 1" >> $CONF + echo "driftfile /etc/chrony/chrony.drift" >> $CONF + /etc/init.d/$INITD start + pidof $INITD + /etc/init.d/$INITD stop + while pidof $INITD; do\ + echo -n "." >/dev/tty;\ + sleep 1;\ + done + apk_del $@ + rm $CONF diff --git a/tests/clamav b/tests/clamav index a9f1892..ebb4b06 100644 --- a/tests/clamav +++ b/tests/clamav @@ -1,6 +1,4 @@ apk_add $@ - # download signatures before we start daemon - freshclam /etc/init.d/clamd start sleep 10 pidof clamd @@ -14,4 +12,4 @@ echo -n "." >/dev/tty;\ sleep 1;\ done - apk_del -R $@ + apk_del $@ diff --git a/tests/cutter b/tests/cutter new file mode 100644 index 0000000..37b59a9 --- /dev/null +++ b/tests/cutter @@ -0,0 +1,4 @@ + modprobe ip_conntrack + apk_add $@ + cutter 127.0.0.1 2>&1 | grep '^No matching' + apk_del $@ diff --git a/tests/cvs b/tests/cvs new file mode 100644 index 0000000..6d19270 --- /dev/null +++ b/tests/cvs @@ -0,0 +1,3 @@ + apk_add $@ + cvs --version + apk_del $@ diff --git a/tests/file b/tests/file new file mode 100644 index 0000000..6358c9e --- /dev/null +++ b/tests/file @@ -0,0 +1,3 @@ + apk_add $@ + file /bin/busybox + apk_del $@ diff --git a/tests/findutils b/tests/findutils new file mode 100644 index 0000000..b36df5e --- /dev/null +++ b/tests/findutils @@ -0,0 +1,4 @@ + apk_add $@ + find .. + apk_del $@ + [ `readlink /usr/bin/find` = /bin/busybox ] diff --git a/tests/flac b/tests/flac new file mode 100644 index 0000000..0a7941e --- /dev/null +++ b/tests/flac @@ -0,0 +1,3 @@ + apk_add $@ + flac --help + apk_del $@ diff --git a/tests/fprobe b/tests/fprobe new file mode 100644 index 0000000..328f99f --- /dev/null +++ b/tests/fprobe @@ -0,0 +1,3 @@ + apk_add $@ + fprobe -h + apk_del $@ diff --git a/tests/gdb b/tests/gdb new file mode 100644 index 0000000..ad73281 --- /dev/null +++ b/tests/gdb @@ -0,0 +1,3 @@ + apk_add $@ + gdb -ex run --batch --args /bin/busybox uptime + apk_del $@ diff --git a/tests/generic-apk b/tests/generic-apk index e14d631..20602c3 100644 --- a/tests/generic-apk +++ b/tests/generic-apk @@ -1,2 +1,5 @@ + if [ $@ = "generic-apk" ]; + then exit 0; + fi apk_add $@ apk_del $@ diff --git a/tests/git b/tests/git new file mode 100644 index 0000000..c905573 --- /dev/null +++ b/tests/git @@ -0,0 +1,9 @@ + apk_add $@ + git init + echo "hello" >hello.txt + git add * + git status + git commit -m'test' + git branch + apk_del $@ + rm -r .git diff --git a/tests/grep b/tests/grep new file mode 100644 index 0000000..6504280 --- /dev/null +++ b/tests/grep @@ -0,0 +1,4 @@ + apk_add $@ + grep --version | grep GNU + apk_del $@ + [ `readlink /bin/grep` = /bin/busybox ] diff --git a/tests/iptraf b/tests/iptraf index d55bf47..aa96480 100644 --- a/tests/iptraf +++ b/tests/iptraf @@ -2,4 +2,4 @@ iptraf -B -g pidof iptraf killall iptraf - apk_del -R $@ + apk_del $@ diff --git a/tests/ircii b/tests/ircii new file mode 100644 index 0000000..59b038c --- /dev/null +++ b/tests/ircii @@ -0,0 +1,3 @@ + apk_add $@ + irc -v + apk_del $@ diff --git a/tests/less b/tests/less new file mode 100644 index 0000000..18d0f56 --- /dev/null +++ b/tests/less @@ -0,0 +1,4 @@ + apk_add $@ + echo hello | less -F + apk_del $@ + [ `readlink /usr/bin/less` = "/bin/busybox" ] diff --git a/tests/links b/tests/links new file mode 100644 index 0000000..d429ef7 --- /dev/null +++ b/tests/links @@ -0,0 +1,3 @@ + apk_add $@ + links -dump http://google.com + apk_del $@ diff --git a/tests/lm_sensors b/tests/lm_sensors index 2bcce89..e6ff5a2 100644 --- a/tests/lm_sensors +++ b/tests/lm_sensors @@ -1,5 +1,3 @@ apk_add $@ - # i dunno how to test this really so we just check linking is ok. - sensord -v sensors -v - apk_del -R $@ + apk_del $@ diff --git a/tests/nano b/tests/nano new file mode 100644 index 0000000..a58aec3 --- /dev/null +++ b/tests/nano @@ -0,0 +1,3 @@ + apk_add $@ + nano -V + apk_del $@ diff --git a/tests/patch b/tests/patch new file mode 100644 index 0000000..e61b4f4 --- /dev/null +++ b/tests/patch @@ -0,0 +1,3 @@ + apk_add $@ + patch --version + apk_del $@ @@ -1,3 +1,3 @@ - apk_add $@ - echo "<? echo(\"hello world\n\") ?>" | php-cgi | grep "hello" - apk_del -R $@ + apk_add $@ php-cli + echo "<?php echo(\"hello world\n\") ?>" | php | grep "hello" + apk_del $@ diff --git a/tests/pmacct b/tests/pmacct new file mode 100644 index 0000000..ddfeaf0 --- /dev/null +++ b/tests/pmacct @@ -0,0 +1,11 @@ + apk_add $@ + /etc/init.d/pmacctd start + sleep 2 + pidof pmacctd + /etc/init.d/pmacctd stop + while pidof pmacctd; do\ + echo -n "." >/dev/tty;\ + sleep 1;\ + done + rm /etc/pmacctd.conf + apk_del $@ diff --git a/tests/pwgen b/tests/pwgen new file mode 100644 index 0000000..d32cfa9 --- /dev/null +++ b/tests/pwgen @@ -0,0 +1,3 @@ + apk_add $@ + pwgen + apk_del $@ diff --git a/tests/rrdtool b/tests/rrdtool index 96ca3da..50f8be9 100644 --- a/tests/rrdtool +++ b/tests/rrdtool @@ -1,4 +1,3 @@ -FILENAME="rrdtool-test" apk_add $@ # Create DB rrdtool create ${FILENAME}.rrd --step 1 DS:eth0r:COUNTER:120:0:U \ @@ -12,4 +11,4 @@ FILENAME="rrdtool-test" COMMENT:" Avarage Maximum Current per second\n" \ "AREA:eth0r#00dd00:Receive " GPRINT:eth0ra:"%12.3lf %sb" \ GPRINT:eth0rm:"%12.3lf %sb" > /dev/null - apk_del -R $@ + apk_del $@ diff --git a/tests/smartmontools b/tests/smartmontools new file mode 100644 index 0000000..eaea80a --- /dev/null +++ b/tests/smartmontools @@ -0,0 +1,3 @@ + apk_add $@ + smartd --version + apk_del $@ diff --git a/tests/strace b/tests/strace new file mode 100644 index 0000000..4560d23 --- /dev/null +++ b/tests/strace @@ -0,0 +1,3 @@ + apk_add $@ + strace busybox + apk_del $@ diff --git a/tests/sudo b/tests/sudo new file mode 100644 index 0000000..9c47d62 --- /dev/null +++ b/tests/sudo @@ -0,0 +1,3 @@ + apk_add $@ + sudo whoami + apk_del $@ diff --git a/tests/tar b/tests/tar new file mode 100644 index 0000000..2353163 --- /dev/null +++ b/tests/tar @@ -0,0 +1,4 @@ + apk_add $@ + tar -zc `pwd` | tar -zt + apk_del $@ + [ "`readlink /bin/tar`" = /bin/busybox ] diff --git a/tests/tcl b/tests/tcl new file mode 100644 index 0000000..838b011 --- /dev/null +++ b/tests/tcl @@ -0,0 +1,3 @@ + apk_add $@ + echo 'puts "hello world"' | tclsh + apk_del $@ diff --git a/tests/tcpdump b/tests/tcpdump new file mode 100644 index 0000000..4428096 --- /dev/null +++ b/tests/tcpdump @@ -0,0 +1,3 @@ + apk_add $@ + tcpdump -i eth0 -c 1 + apk_del $@ diff --git a/tests/testdisk b/tests/testdisk new file mode 100644 index 0000000..cf2dce2 --- /dev/null +++ b/tests/testdisk @@ -0,0 +1,3 @@ + apk_add $@ + testdisk /list + apk_del $@ diff --git a/tests/tinc b/tests/tinc new file mode 100644 index 0000000..ea4b21b --- /dev/null +++ b/tests/tinc @@ -0,0 +1,3 @@ + apk_add $@ + tincd --version + apk_del $@ diff --git a/tests/unrar b/tests/unrar new file mode 100644 index 0000000..c76e9b6 --- /dev/null +++ b/tests/unrar @@ -0,0 +1,3 @@ + apk_add $@ + unrar p test.rar + apk_del $@ diff --git a/tests/vim b/tests/vim new file mode 100644 index 0000000..a7f60ce --- /dev/null +++ b/tests/vim @@ -0,0 +1,5 @@ + apk_add $@ + echo "hello world" > test.txt + echo -e "%s/hello/goodbye/\nwrite\nquit" | vim -e -s test.txt + grep goodbye test.txt + apk_del $@ diff --git a/tests/vlc b/tests/vlc new file mode 100644 index 0000000..dfa69ad --- /dev/null +++ b/tests/vlc @@ -0,0 +1,4 @@ + apk_add $@ + su operator -c "vlc --version" + su operator -c "vlc -l | grep access_output_http" + apk_del $@ diff --git a/tests/vsftpd b/tests/vsftpd new file mode 100644 index 0000000..c849705 --- /dev/null +++ b/tests/vsftpd @@ -0,0 +1,10 @@ + apk_add $@ + /etc/init.d/$@ start + sleep 2 + pidof $@ + /etc/init.d/$@ stop + while pidof $@; do\ + echo -n "." >/dev/tty;\ + sleep 1;\ + done + apk_del $@ diff --git a/tests/wget b/tests/wget new file mode 100644 index 0000000..25fd175 --- /dev/null +++ b/tests/wget @@ -0,0 +1,4 @@ + apk_add $@ + wget --version | grep GNU + apk_del $@ + [ `readlink /usr/bin/wget` = /bin/busybox ] diff --git a/tests/wireless-tools b/tests/wireless-tools new file mode 100644 index 0000000..07fd409 --- /dev/null +++ b/tests/wireless-tools @@ -0,0 +1,4 @@ + apk_add $@ + iwconfig + iwpriv + apk_del $@ diff --git a/tests/wireshark b/tests/wireshark new file mode 100644 index 0000000..ebbc602 --- /dev/null +++ b/tests/wireshark @@ -0,0 +1,3 @@ + apk_add $@ + wireshark -v + apk_del $@ diff --git a/torvalds-says-linux.mp3 b/torvalds-says-linux.mp3 Binary files differnew file mode 100644 index 0000000..204b9a3 --- /dev/null +++ b/torvalds-says-linux.mp3 |