X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fshell%2Fimport-duplicates.test;h=39ef41230c2de0823b42fd76aa36159ad469b6a2;hb=851343d40c130b178741356c8812f70ab4219e15;hp=afce3e51ede8b7ba8ab9ee099cf4a7a9e9426ba5;hpb=1f1b0076266ccb665b7d9470f4ed5f2edbc680a4;p=dead%2Fhtsn-import.git

diff --git a/test/shell/import-duplicates.test b/test/shell/import-duplicates.test
index afce3e5..39ef412 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
 >>>
-12
+38
 >>>= 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*11
-# 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
 >>>
-22
+68
 >>>= 0
 
 # Finally, clean up after ourselves.