X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fshell%2Fimport-duplicates.test;h=a8b356160070d44c18e26eda3051c1981988457d;hb=c864af7aa8a195cf441904479c416202590e9375;hp=039ebad4aafa8c2d77755f8404c6ac0392bc8997;hpb=8c7f33d76981a27a4fde6271dc71105b23adc5a1;p=dead%2Fhtsn-import.git

diff --git a/test/shell/import-duplicates.test b/test/shell/import-duplicates.test
index 039ebad..a8b3561 100644
--- a/test/shell/import-duplicates.test
+++ b/test/shell/import-duplicates.test
@@ -12,18 +12,21 @@ rm -f shelltest.sqlite3
 >>>= 0
 
 # We note the number of XML files that we have. There's one extra
-# Heartbeat.xml that doesn't really count.
-find ./test/xml -name '*.xml' | wc -l
+# Heartbeat.xml that doesn't really count. There are also 2 weatherxml
+# and a newsxml that aren't really supposed to import.
+find ./test/xml -maxdepth 1 -name '*.xml' | wc -l
 >>>
-16
+40
 >>>= 0
 
 # Run the imports again; we should get complaints about the duplicate
-# xml_file_ids. There are 2 errors for each violation, so we expect 2*15
-# occurrences of the string 'ERROR'.
+# xml_file_ids. There are 2 errors for each violation, so we expect
+# (twice the number of files) occurrences of the string 'ERROR'. Oh
+# and we subtract 2 because 2 of the files are supposed to fail. I
+# know, sorry.
 ./dist/build/htsn-import/htsn-import -c 'shelltest.sqlite3' test/xml/*.xml 2>&1 | grep ERROR | wc -l
 >>>
-30
+72
 >>>= 0
 
 # Finally, clean up after ourselves.