improve tests for addtopackage

diff --git a/t/addtopackage.t b/t/addtopackage.t
index a0ef944edc1a58b600d9463bdb8a13a3cf289577..d3fd86fe78b9fd5f5c568b8e4c0e09508c9670ea 100755 (executable)
--- a/t/addtopackage.t
+++ b/t/addtopackage.t
@@ -14,17 +14,23 @@ rm -rf $td
 mkdir $td
 echo foo > $td/foo
 
-tryrun zpm addtopackage zpmtest $td/foo
+rm zpmtest-1.0-1.zpm
+
+require zpm addtopackage zpmtest $td/foo
 h=$(zpm hash $td/foo)
-tryrun zpm extract zpmtest-1.0-1.zpm $h $td/foo2
+require zpm extract zpmtest-1.0-1.zpm $h $td/foo2
+ls -l $td
 h2=$(zpm hash $td/foo2)
 okstreq "$h" "$h2"
+
 pkglist=$(zpm showpkg zpmtest-1.0-1.zpm)
 set $pkglist
-okstreq "$1" "zpmtest"
-okstreq "$2" "1.0"
-okstreq "$3" "1"
-okstreq "$4" "$td/foo"
+okstreq "$1" "zpmtest" package name
+okstreq "$2" "1.0" package version
+okstreq "$3" "1" package release
+okstreq "$4" "$td/foo" file foo in package
+diag "$pkglist"
+
 
 finish