From e1e82671870076a73766e628f8755a1f7e0afe11 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 1 Jun 2013 11:56:57 -0600 Subject: reorganize the tests a bit --- test/lib-blacklist-test.sh | 69 ++++++++++++++++++++++ test/lib-messages-test.sh | 46 +++++++++++++++ test/libreblacklist-test.sh | 69 ---------------------- test/libremessages-test.sh | 46 --------------- test/pkgbuild-check-nonfree-test.sh | 8 +-- test/pkgbuild-check-nonfree.PKGBUILD.free | 18 ------ test/pkgbuild-check-nonfree.PKGBUILD.nonfree | 18 ------ ...uild-check-nonfree.PKGBUILD.nonfree-replacement | 18 ------ test/pkgbuild-check-nonfree.d/PKGBUILD.free | 18 ++++++ test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree | 18 ++++++ .../PKGBUILD.nonfree-replacement | 18 ++++++ 11 files changed, 173 insertions(+), 173 deletions(-) create mode 100644 test/lib-blacklist-test.sh create mode 100644 test/lib-messages-test.sh delete mode 100644 test/libreblacklist-test.sh delete mode 100644 test/libremessages-test.sh delete mode 100644 test/pkgbuild-check-nonfree.PKGBUILD.free delete mode 100644 test/pkgbuild-check-nonfree.PKGBUILD.nonfree delete mode 100644 test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement create mode 100644 test/pkgbuild-check-nonfree.d/PKGBUILD.free create mode 100644 test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree create mode 100644 test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement (limited to 'test') diff --git a/test/lib-blacklist-test.sh b/test/lib-blacklist-test.sh new file mode 100644 index 0000000..94f5b27 --- /dev/null +++ b/test/lib-blacklist-test.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env roundup + +describe libreblacklist + +before() { + tmpdir=$(mktemp -d --tmpdir test-libreblacklist.XXXXXXXXXXXX) + stat=0 +} + +after() { + rm -rf -- "$tmpdir" "$XDG_CACHE_HOME" "$XDG_CONFIG_HOME" +} + +it_works_with_just_pkgname() { + v="$(libreblacklist normalize <<$XDG_CONFIG_HOME/libretools/libretools.conf + + libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + + [[ $stat != 0 ]] + [[ -z "$(cat $tmpdir/stdout)" ]] + [[ -n "$(cat $tmpdir/stderr)" ]] +} + +it_fails_cat_when_there_is_no_blacklist_or_network() { + mkdir -p $XDG_CONFIG_HOME/libretools + echo "BLACKLIST='http://phony'" >$XDG_CONFIG_HOME/libretools/libretools.conf + + libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + + [[ $stat != 0 ]] + [[ -z "$(cat $tmpdir/stdout)" ]] + [[ -n "$(cat $tmpdir/stderr)" ]] +} + +# TODO: test blacklist-update, but I don't want tests to use network diff --git a/test/lib-messages-test.sh b/test/lib-messages-test.sh new file mode 100644 index 0000000..22aad47 --- /dev/null +++ b/test/lib-messages-test.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env roundup + +describe libremessages + +before() { + tmpdir=$(mktemp -d --tmpdir test-libremessages.XXXXXXXXXXXX) +} + +after() { + rm -rf -- "$tmpdir" +} + +it_can_be_included_twice() ( + . libremessages + . libremessages +) + +it_can_be_included_with_set_euE() ( + set -euE + . libremessages +) + +it_works_with_no_color_and_set_euE() ( + ( + unset TERM + set -euE + . libremessages + msg Foo + ) >$tmpdir/stdout 2>$tmpdir/stderr + + [[ -z "$(cat $tmpdir/stdout)" ]] + [[ -n "$(cat $tmpdir/stderr)" ]] +) + +it_can_be_called_without_including() { + libremessages msg Foo >$tmpdir/stdout 2>$tmpdir/stderr + + [[ -z "$(cat $tmpdir/stdout)" ]] + [[ -n "$(cat $tmpdir/stderr)" ]] +} + +it_fails_with_msg_and_no_args() { + ret=0 + libremessages msg || ret=$? + [[ $ret != 0 ]] +} diff --git a/test/libreblacklist-test.sh b/test/libreblacklist-test.sh deleted file mode 100644 index 94f5b27..0000000 --- a/test/libreblacklist-test.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env roundup - -describe libreblacklist - -before() { - tmpdir=$(mktemp -d --tmpdir test-libreblacklist.XXXXXXXXXXXX) - stat=0 -} - -after() { - rm -rf -- "$tmpdir" "$XDG_CACHE_HOME" "$XDG_CONFIG_HOME" -} - -it_works_with_just_pkgname() { - v="$(libreblacklist normalize <<$XDG_CONFIG_HOME/libretools/libretools.conf - - libreblacklist update >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? - - [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] -} - -it_fails_cat_when_there_is_no_blacklist_or_network() { - mkdir -p $XDG_CONFIG_HOME/libretools - echo "BLACKLIST='http://phony'" >$XDG_CONFIG_HOME/libretools/libretools.conf - - libreblacklist cat >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? - - [[ $stat != 0 ]] - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] -} - -# TODO: test blacklist-update, but I don't want tests to use network diff --git a/test/libremessages-test.sh b/test/libremessages-test.sh deleted file mode 100644 index 22aad47..0000000 --- a/test/libremessages-test.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env roundup - -describe libremessages - -before() { - tmpdir=$(mktemp -d --tmpdir test-libremessages.XXXXXXXXXXXX) -} - -after() { - rm -rf -- "$tmpdir" -} - -it_can_be_included_twice() ( - . libremessages - . libremessages -) - -it_can_be_included_with_set_euE() ( - set -euE - . libremessages -) - -it_works_with_no_color_and_set_euE() ( - ( - unset TERM - set -euE - . libremessages - msg Foo - ) >$tmpdir/stdout 2>$tmpdir/stderr - - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] -) - -it_can_be_called_without_including() { - libremessages msg Foo >$tmpdir/stdout 2>$tmpdir/stderr - - [[ -z "$(cat $tmpdir/stdout)" ]] - [[ -n "$(cat $tmpdir/stderr)" ]] -} - -it_fails_with_msg_and_no_args() { - ret=0 - libremessages msg || ret=$? - [[ $ret != 0 ]] -} diff --git a/test/pkgbuild-check-nonfree-test.sh b/test/pkgbuild-check-nonfree-test.sh index 8a2e349..5ddd341 100644 --- a/test/pkgbuild-check-nonfree-test.sh +++ b/test/pkgbuild-check-nonfree-test.sh @@ -30,7 +30,7 @@ it_displays_usage_text() { } it_succeeds_for_free_depends() { - $pcn $pcn.PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] @@ -38,7 +38,7 @@ it_succeeds_for_free_depends() { } it_succeeds_for_nonfree_depend_with_replacement() { - $pcn $pcn.PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.nonfree-replacement >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] @@ -46,7 +46,7 @@ it_succeeds_for_nonfree_depend_with_replacement() { } it_fails_with_15_for_nonfree_depend() { - $pcn $pcn.PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.nonfree >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] @@ -58,7 +58,7 @@ it_fails_when_there_is_no_blacklist() { echo "BLACKLIST='http://phony'" >$XDG_CONFIG_HOME/libretools/libretools.conf rm $XDG_CACHE_HOME/libretools/blacklist.txt - $pcn $pcn.PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? + $pcn $pcn.d/PKGBUILD.free >$tmpdir/stdout 2>$tmpdir/stderr || stat=$? [[ -z "$(cat $tmpdir/stdout)" ]] [[ -n "$(cat $tmpdir/stderr)" ]] diff --git a/test/pkgbuild-check-nonfree.PKGBUILD.free b/test/pkgbuild-check-nonfree.PKGBUILD.free deleted file mode 100644 index 4b8f0dd..0000000 --- a/test/pkgbuild-check-nonfree.PKGBUILD.free +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=wmii -pkgver=3.9.2 -pkgrel=3 -pkgdesc="A small, dynamic window manager for X11" -arch=('i686' 'x86_64') -license=('MIT') -url="http://wmii.suckless.org/" -depends=('libxft' 'libxrandr' 'libxinerama' 'dash') -source=() -md5sums=() - -build() { - : -} - -package() { - : -} diff --git a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree b/test/pkgbuild-check-nonfree.PKGBUILD.nonfree deleted file mode 100644 index 3a7afa4..0000000 --- a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=wmii -pkgver=3.9.2 -pkgrel=3 -pkgdesc="A small, dynamic window manager for X11" -arch=('i686' 'x86_64') -license=('MIT') -url="http://wmii.suckless.org/" -depends=('skype') # random non-free package with no other information -source=() -md5sums=() - -build() { - : -} - -package() { - : -} diff --git a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement b/test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement deleted file mode 100644 index 7855bdc..0000000 --- a/test/pkgbuild-check-nonfree.PKGBUILD.nonfree-replacement +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=wmii -pkgver=3.9.2 -pkgrel=3 -pkgdesc="A small, dynamic window manager for X11" -arch=('i686' 'x86_64') -license=('MIT') -url="http://wmii.suckless.org/" -depends=('linux') # random non-free package with a replacement -source=() -md5sums=() - -build() { - : -} - -package() { - : -} diff --git a/test/pkgbuild-check-nonfree.d/PKGBUILD.free b/test/pkgbuild-check-nonfree.d/PKGBUILD.free new file mode 100644 index 0000000..4b8f0dd --- /dev/null +++ b/test/pkgbuild-check-nonfree.d/PKGBUILD.free @@ -0,0 +1,18 @@ +pkgname=wmii +pkgver=3.9.2 +pkgrel=3 +pkgdesc="A small, dynamic window manager for X11" +arch=('i686' 'x86_64') +license=('MIT') +url="http://wmii.suckless.org/" +depends=('libxft' 'libxrandr' 'libxinerama' 'dash') +source=() +md5sums=() + +build() { + : +} + +package() { + : +} diff --git a/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree new file mode 100644 index 0000000..3a7afa4 --- /dev/null +++ b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree @@ -0,0 +1,18 @@ +pkgname=wmii +pkgver=3.9.2 +pkgrel=3 +pkgdesc="A small, dynamic window manager for X11" +arch=('i686' 'x86_64') +license=('MIT') +url="http://wmii.suckless.org/" +depends=('skype') # random non-free package with no other information +source=() +md5sums=() + +build() { + : +} + +package() { + : +} diff --git a/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement new file mode 100644 index 0000000..7855bdc --- /dev/null +++ b/test/pkgbuild-check-nonfree.d/PKGBUILD.nonfree-replacement @@ -0,0 +1,18 @@ +pkgname=wmii +pkgver=3.9.2 +pkgrel=3 +pkgdesc="A small, dynamic window manager for X11" +arch=('i686' 'x86_64') +license=('MIT') +url="http://wmii.suckless.org/" +depends=('linux') # random non-free package with a replacement +source=() +md5sums=() + +build() { + : +} + +package() { + : +} -- cgit v1.2.2