v0.2.48..v0.2.49 changeset ServiceHootApiDbConflateTest.sh

diff --git a/test-files/cmd/slow/ServiceHootApiDbConflateTest.sh b/test-files/cmd/slow/ServiceHootApiDbConflateTest.sh
index 4565bd9..9639bdf 100755
--- a/test-files/cmd/slow/ServiceHootApiDbConflateTest.sh
+++ b/test-files/cmd/slow/ServiceHootApiDbConflateTest.sh
@@ -12,14 +12,14 @@ mkdir -p test-output/cmd/slow/ServiceHootApiDbConflateTest
 
 echo "Running select all conflate..."
 
-hoot delete-db-map $HOOT_OPTS "$DB_URL/AllDataTypesA-ServiceHootApiDbConflateTest" &
-hoot delete-db-map $HOOT_OPTS "$DB_URL/AllDataTypesB-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/AllDataTypesA-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/AllDataTypesB-ServiceHootApiDbConflateTest" &
 wait
 ###
 # I've run into strange situations where it seems like the whole files isn't being converted.
-# It almost looks like the transaction isn't fully committed when the conflat op runs. I can't
+# It almost looks like the transaction isn't fully committed when the conflate op runs. I can't
 # reproduce it reliably, but I would like to fix it if I can get more info. -JRS
-# I think this is fixed by #3588, but can't really prove a negative. -JRS
+# UPDATE: I think this is fixed by redmine #3588, but can't really prove a negative. -JRS
 ##
 hoot convert $HOOT_OPTS test-files/conflate/unified/AllDataTypesA.osm "$DB_URL/AllDataTypesA-ServiceHootApiDbConflateTest" &
 hoot convert $HOOT_OPTS test-files/conflate/unified/AllDataTypesB.osm "$DB_URL/AllDataTypesB-ServiceHootApiDbConflateTest" &
@@ -28,18 +28,18 @@ wait
 hoot conflate $HOOT_OPTS -D conflate.post.ops++="hoot::RemoveTagsVisitor;hoot::RemoveAttributesVisitor" -D tag.filter.keys="source:datetime" -D remove.attributes.visitor.types="changeset;timestamp" "$DB_URL/AllDataTypesA-ServiceHootApiDbConflateTest" "$DB_URL/AllDataTypesB-ServiceHootApiDbConflateTest" test-output/cmd/slow/ServiceHootApiDbConflateTest/output1.osm
 hoot diff test-files/cmd/slow/ServiceHootApiDbConflateTest/output1.osm test-output/cmd/slow/ServiceHootApiDbConflateTest/output1.osm
 
-hoot delete-db-map $HOOT_OPTS "$DB_URL/AllDataTypesA-ServiceHootApiDbConflateTest" &
-hoot delete-db-map $HOOT_OPTS "$DB_URL/AllDataTypesB-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/AllDataTypesA-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/AllDataTypesB-ServiceHootApiDbConflateTest" &
 wait
 
 export PGPASSWORD=$DB_PASSWORD
-psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw AllDataTypesA-ServiceHootApiDbConflateTest && echo "Error: delete-db-map did not remove AllDataTypesA-ServiceHootApiDbConflateTest dataset"
-psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw AllDataTypesB-ServiceHootApiDbConflateTest && echo "Error: delete-db-map did not remove AllDataTypesB-ServiceHootApiDbConflateTest dataset"
+psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw AllDataTypesA-ServiceHootApiDbConflateTest && echo "Error: db-delete-map did not remove AllDataTypesA-ServiceHootApiDbConflateTest dataset"
+psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw AllDataTypesB-ServiceHootApiDbConflateTest && echo "Error: db-delete-map did not remove AllDataTypesB-ServiceHootApiDbConflateTest dataset"
 
 echo "Running select by bounds conflate..."
 
-hoot delete-db-map $HOOT_OPTS "$DB_URL/DcGisRoads-ServiceHootApiDbConflateTest" &
-hoot delete-db-map $HOOT_OPTS "$DB_URL/DcTigerRoads-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/DcGisRoads-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/DcTigerRoads-ServiceHootApiDbConflateTest" &
 wait
 
 hoot convert $HOOT_OPTS test-files/DcGisRoads.osm "$DB_URL/DcGisRoads-ServiceHootApiDbConflateTest" &
@@ -49,13 +49,13 @@ wait
 hoot conflate $HOOT_OPTS -D convert.bounding.box=-77.04,38.8916,-77.03324,38.8958 -D conflate.post.ops++="hoot::RemoveTagsVisitor;hoot::RemoveAttributesVisitor" -D tag.filter.keys="source:datetime" -D remove.attributes.visitor.types="changeset;timestamp" "$DB_URL/DcGisRoads-ServiceHootApiDbConflateTest" "$DB_URL/DcTigerRoads-ServiceHootApiDbConflateTest" test-output/cmd/slow/ServiceHootApiDbConflateTest/output2.osm
 hoot diff test-files/cmd/slow/ServiceHootApiDbConflateTest/output2.osm test-output/cmd/slow/ServiceHootApiDbConflateTest/output2.osm
 
-hoot delete-db-map $HOOT_OPTS "$DB_URL/DcGisRoads-ServiceHootApiDbConflateTest" &
-hoot delete-db-map $HOOT_OPTS "$DB_URL/DcTigerRoads-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/DcGisRoads-ServiceHootApiDbConflateTest" &
+hoot db-delete-map $HOOT_OPTS "$DB_URL/DcTigerRoads-ServiceHootApiDbConflateTest" &
 wait
 
 export PGPASSWORD=$DB_PASSWORD
-psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw DcGisRoads-ServiceHootApiDbConflateTest && echo "Error: delete-db-map did not remove DcGisRoads-ServiceHootApiDbConflateTest dataset"
-psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw DcTigerRoads-ServiceHootApiDbConflateTest && echo "Error: delete-db-map did not remove DcTigerRoads-ServiceHootApiDbConflateTest dataset"
+psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw DcGisRoads-ServiceHootApiDbConflateTest && echo "Error: db-delete-map did not remove DcGisRoads-ServiceHootApiDbConflateTest dataset"
+psql -U $DB_USER -h $DB_HOST -p $DB_PORT -d $DB_NAME -c "select display_name from maps;" | grep -qw DcTigerRoads-ServiceHootApiDbConflateTest && echo "Error: db-delete-map did not remove DcTigerRoads-ServiceHootApiDbConflateTest dataset"