X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=test%2Fshell%2Fimport-duplicates.test;h=1cc7bd633c62571b828e356c54c36e2c3ecfb607;hb=fcc8c66fa433134d374f9347329ffa122ad0e4be;hp=b4c3fa56e68e0ea15dddb2de6d9b7b69e4260b5d;hpb=6c0f782525b51d1f99f337ddfebc31d54c499b3d;p=dead%2Fhtsn-import.git

diff --git a/test/shell/import-duplicates.test b/test/shell/import-duplicates.test
index b4c3fa5..1cc7bd6 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
+39
 >>>= 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*13
-# 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
 >>>
-26
+70
 >>>= 0
 
 # Finally, clean up after ourselves.