From a60fe762595fa963ddc5dd89112b8cedd7d6ed12 Mon Sep 17 00:00:00 2001
From: Andy Eschbacher <andy.eschbacher@gmail.com>
Date: Thu, 5 May 2016 14:01:53 -0400
Subject: [PATCH] minor test fixes

---
 .../44_observatory_geometries_test.out        | 60 ++-----------------
 1 file changed, 5 insertions(+), 55 deletions(-)

diff --git a/src/pg/test/expected/44_observatory_geometries_test.out b/src/pg/test/expected/44_observatory_geometries_test.out
index 3df9826..781ba92 100644
--- a/src/pg/test/expected/44_observatory_geometries_test.out
+++ b/src/pg/test/expected/44_observatory_geometries_test.out
@@ -1,32 +1,8 @@
-\i test/sql/load_fixtures.sql
+\pset format unaligned
+\set ECHO all
+\i test/fixtures/load_fixtures.sql
 SET client_min_messages TO WARNING;
 \set ECHO none
-Loading obs_table.sql fixture file...
-Done.
-Loading obs_column.sql fixture file...
-Done.
-Loading obs_column_table.sql fixture file...
-Done.
-Loading obs_column_to_column.sql fixture file...
-Done.
-Loading obs_column_tag.sql fixture file...
-Done.
-Loading obs_tag.sql fixture file...
-Done.
-Loading obs_85328201013baa14e8e8a4a57a01e6f6fbc5f9b1.sql fixture file...
-Done.
-Loading obs_3e7cc9cfd403b912c57b42d5f9195af9ce2f3cdb.sql fixture file...
-Done.
-Loading obs_ab038198aaab3f3cb055758638ee4de28ad70146.sql fixture file...
-Done.
-Loading obs_a92e1111ad3177676471d66bb8036e6d057f271b.sql fixture file...
-Done.
-Loading obs_11ee8b82c877c073438bc935a91d3dfccef875d1.sql fixture file...
-Done.
-Loading obs_d34555209878e8c4b37cf0b2b3d072ff129ec470.sql fixture file...
-Done.
-Loading obs_b0ef6dd68d5faddbf231fd7f02916b3d00ec43c4.sql fixture file...
-Done.
 obs_getboundary_cartodb_census_tract
 t
 (1 row)
@@ -96,7 +72,7 @@ t
 obs_getpointsbygeometry_around_cartodb
 t
 (1 row)
-obs_getpointsbygeometry_around_cartodb_2013
+obs_getpointsbygeometry_around_cartodb_2014
 t
 (1 row)
 obs_getpointsbygeometry_around_null_island
@@ -105,7 +81,7 @@ t
 obs_getpointsbypointandradius_around_cartodb
 t
 (1 row)
-obs_getpointsbypointandradius_around_cartodb_2013
+obs_getpointsbypointandradius_around_cartodb_2014
 t
 (1 row)
 obs_getpointsbypointandradius_around_null_island
@@ -114,29 +90,3 @@ t
 geoid_name_matches|table_name_matches|geom_name_matches
 t|t|t
 (1 row)
-Dropping obs_table.sql fixture table...
-Done.
-Dropping obs_column.sql fixture table...
-Done.
-Dropping obs_column_table.sql fixture table...
-Done.
-Dropping obs_column_to_column.sql fixture table...
-Done.
-Dropping obs_column_tag.sql fixture table...
-Done.
-Dropping obs_tag.sql fixture table...
-Done.
-Dropping obs_85328201013baa14e8e8a4a57a01e6f6fbc5f9b1 fixture table...
-Done.
-Dropping obs_3e7cc9cfd403b912c57b42d5f9195af9ce2f3cdb fixture table...
-Done.
-Dropping obs_ab038198aaab3f3cb055758638ee4de28ad70146 fixture table...
-Done.
-Dropping obs_a92e1111ad3177676471d66bb8036e6d057f271b fixture table...
-Done.
-Dropping obs_11ee8b82c877c073438bc935a91d3dfccef875d1 fixture table...
-Done.
-Dropping obs_d34555209878e8c4b37cf0b2b3d072ff129ec470 fixture table...
-Done.
-Dropping obs_b0ef6dd68d5faddbf231fd7f02916b3d00ec43c4 fixture table...
-Done.