INN commit: trunk/tests (6 files)

[INN Commit]

    Date: Wednesday, August 1, 2007 @ 06:50:05
  Author: iulius
Revision: 7616

Add existing lib/hstrerror.t and overview/overchan.t tests to the list
of tests to be executed.
Fix two tests in lib/hstrerror.t and add some clean up to other tests.

Modified:
  trunk/tests/TESTS
  trunk/tests/lib/hstrerror-t.c
  trunk/tests/overview/api-t.c
  trunk/tests/overview/overview-t.c
  trunk/tests/overview/xref-t.c
  trunk/tests/util/inndf.t

-----------------------+
 TESTS                 |    2 ++
 lib/hstrerror-t.c     |    4 ++--
 overview/api-t.c      |    4 ++--
 overview/overview-t.c |    4 ++--
 overview/xref-t.c     |    2 +-
 util/inndf.t          |    3 ++-
 6 files changed, 11 insertions(+), 8 deletions(-)

Modified: TESTS
===================================================================
--- TESTS	2007-08-01 13:07:24 UTC (rev 7615)
+++ TESTS	2007-08-01 13:50:05 UTC (rev 7616)
@@ -16,6 +16,7 @@
 lib/hash
 lib/hashtab
 lib/hex
+lib/hstrerror
 lib/inet_aton
 lib/inet_ntoa
 lib/inet_ntop
@@ -43,6 +44,7 @@
 nnrpd/auth-ext
 overview/api
 overview/buffindexed
+overview/overchan
 overview/tradindexed
 overview/xref
 storage/archive

Modified: lib/hstrerror-t.c
===================================================================
--- lib/hstrerror-t.c	2007-08-01 13:07:24 UTC (rev 7615)
+++ lib/hstrerror-t.c	2007-08-01 13:50:05 UTC (rev 7616)
@@ -25,8 +25,8 @@
     test_error(3, "No address associated with name", NO_ADDRESS);
     test_error(4, "Resolver error 777777", 777777);
     test_error(5, "Resolver error -99999", -99999);
-    test_error(6, "", 1000000);
-    test_error(7, "", -100000);
+    test_error(6, "Resolver error 1000000", 1000000);
+    test_error(7, "Resolver error -100000", -100000);
 
     return 0;
 }

Modified: overview/api-t.c
===================================================================
--- overview/api-t.c	2007-08-01 13:07:24 UTC (rev 7615)
+++ overview/api-t.c	2007-08-01 13:50:05 UTC (rev 7616)
@@ -572,7 +572,7 @@
     ok(n++, overview_verify_data("overview/bogus", overview));
     hash_free(groups);
     overview_close(overview);
-    system("/bin/rm -r ov-tmp");
+    system("/bin/rm -rf ov-tmp");
     ok(n++, true);
     return n;
 }
@@ -668,7 +668,7 @@
     ok(n++, overview_verify_data("overview/bogus", overview));
     hash_free(groups);
     overview_close(overview);
-    system("/bin/rm -r ov-tmp");
+    system("/bin/rm -rf ov-tmp");
     ok(n++, true);
     return n;
 }

Modified: overview/overview-t.c
===================================================================
--- overview/overview-t.c	2007-08-01 13:07:24 UTC (rev 7615)
+++ overview/overview-t.c	2007-08-01 13:50:05 UTC (rev 7616)
@@ -120,7 +120,7 @@
 static bool
 overview_init(void)
 {
-    system("/bin/rm -r ov-tmp");
+    system("/bin/rm -rf ov-tmp");
     if (mkdir("ov-tmp", 0755))
         sysdie("Cannot mkdir ov-tmp");
     if (strcmp(innconf->ovmethod, "buffindexed") == 0)
@@ -552,7 +552,7 @@
     ok(20, overview_verify_data("overview/bogus"));
     hash_free(groups);
     OVclose();
-    system("/bin/rm -r ov-tmp");
+    system("/bin/rm -rf ov-tmp");
     ok(21, true);
 
     return 0;

Modified: overview/xref-t.c
===================================================================
--- overview/xref-t.c	2007-08-01 13:07:24 UTC (rev 7615)
+++ overview/xref-t.c	2007-08-01 13:50:05 UTC (rev 7616)
@@ -45,7 +45,7 @@
 static struct overview *
 overview_init(void)
 {
-    system("/bin/rm -rf ov-tmp");
+    system("/bin/rm -rf ov-tmp spool");
     if (mkdir("ov-tmp", 0755))
         sysdie("Cannot mkdir ov-tmp");
     if (mkdir("spool", 0755))

Modified: util/inndf.t
===================================================================
--- util/inndf.t	2007-08-01 13:07:24 UTC (rev 7615)
+++ util/inndf.t	2007-08-01 13:50:05 UTC (rev 7616)
@@ -72,13 +72,14 @@
 cp articles/2 spool/example/config/1
 cp articles/3 spool/example/test/2
 cp articles/4 spool/example/test/3
+rm -f spool/example/config/2
 ln -s ../test/2 spool/example/config/2
 
 # First, generate a tradindexed overview to test inndf -n and make sure that
 # inndf -o returns the appropriate thing.
 INN_TESTSUITE=1; export INN_TESTSUITE
 INNCONF="etc/inn-tdx.conf"; export INNCONF
-mkdir ov-tmp tmp run
+mkdir -p ov-tmp tmp run
 if ! $makehistory -x -O > /dev/null 2>&1 ; then
     echo "makehistory failed, unable to continue" >&2
     exit 1