From 445d4cf97d81de977d1b1920f8b9a1c31849710a Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@carto.com>
Date: Wed, 4 Oct 2017 16:22:33 +0200
Subject: [PATCH 1/4] Upgrade googlemaps python library to v2.5.1

This closes #383
---
 server/lib/python/cartodb_services/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/lib/python/cartodb_services/requirements.txt b/server/lib/python/cartodb_services/requirements.txt
index 822d980..74693fe 100644
--- a/server/lib/python/cartodb_services/requirements.txt
+++ b/server/lib/python/cartodb_services/requirements.txt
@@ -1,7 +1,7 @@
 redis==2.10.5
 hiredis==0.1.5
 python-dateutil==2.2
-googlemaps==2.4.2
+googlemaps==2.5.1
 rollbar==0.13.2
 # Dependency for googlemaps package
 requests==2.9.1

From 98eef7ae0250132df675a0a0829d1a51c170c2d3 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@carto.com>
Date: Wed, 4 Oct 2017 16:38:54 +0200
Subject: [PATCH 2/4] Improve robustness of client tests

All tests that were failing in CI with this diffs showing traces with
context, which correspond to a default `VERBOSITY verbose` in the server.

Since we migrated the CI to postgres 9.6 it makes sense to see such
differences in server configuration.

Enforcing the verbosity level makes the tests more robust indeed.
---
 client/test/expected/10_admin0_test.out                     | 1 +
 client/test/expected/20_admin1_test.out                     | 1 +
 .../expected/25_exception_safe_private_functions_test.out   | 6 +-----
 client/test/expected/30_namedplaces_test.out                | 1 +
 client/test/expected/40_postalcodes_test.out                | 1 +
 client/test/expected/50_ipaddresses_test.out                | 1 +
 client/test/expected/60_street_test.out                     | 1 +
 client/test/expected/80_route_point_to_point_test.out       | 1 +
 client/test/expected/90_data_observatory_test.out           | 1 +
 client/test/expected/999_permissions_test.out               | 1 +
 client/test/sql/10_admin0_test.sql                          | 1 +
 client/test/sql/20_admin1_test.sql                          | 1 +
 .../test/sql/25_exception_safe_private_functions_test.sql   | 1 +
 client/test/sql/30_namedplaces_test.sql                     | 1 +
 client/test/sql/40_postalcodes_test.sql                     | 1 +
 client/test/sql/50_ipaddresses_test.sql                     | 1 +
 client/test/sql/60_street_test.sql                          | 1 +
 client/test/sql/80_route_point_to_point_test.sql            | 1 +
 client/test/sql/90_data_observatory_test.sql                | 1 +
 client/test/sql/999_permissions_test.sql                    | 1 +
 20 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/client/test/expected/10_admin0_test.out b/client/test/expected/10_admin0_test.out
index 03e247f..02e3351 100644
--- a/client/test/expected/10_admin0_test.out
+++ b/client/test/expected/10_admin0_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server function
diff --git a/client/test/expected/20_admin1_test.out b/client/test/expected/20_admin1_test.out
index ea61949..0ead0aa 100644
--- a/client/test/expected/20_admin1_test.out
+++ b/client/test/expected/20_admin1_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/25_exception_safe_private_functions_test.out b/client/test/expected/25_exception_safe_private_functions_test.out
index 6d18ab6..aeb5bd9 100644
--- a/client/test/expected/25_exception_safe_private_functions_test.out
+++ b/client/test/expected/25_exception_safe_private_functions_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 SET client_min_messages TO warning;
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions to raise exceptions
@@ -31,8 +32,6 @@ SET ROLE test_regular_user;
 -- Exercise the exception safe and the proxied functions
 SELECT _cdb_geocode_street_point_exception_safe('One street, 1');
 WARNING:  cdb_dataservices_client._cdb_geocode_street_point(6): [contrib_regression] REMOTE ERROR: Not enough quota or any other exception whatsoever.
-DETAIL:  SQL statement "SELECT cdb_dataservices_client._cdb_geocode_street_point(username, orgname, searchtext, city, state_province, country)"
-PL/pgSQL function _cdb_geocode_street_point_exception_safe(text,text,text,text) line 21 at SQL statement
  _cdb_geocode_street_point_exception_safe 
 ------------------------------------------
  
@@ -40,15 +39,12 @@ PL/pgSQL function _cdb_geocode_street_point_exception_safe(text,text,text,text)
 
 SELECT * FROM _cdb_isodistance_exception_safe('POINT(-3.70568 40.42028)'::geometry, 'walk', ARRAY[300]::integer[]);
 WARNING:  cdb_dataservices_client._cdb_isodistance(6): [contrib_regression] REMOTE ERROR: Not enough quota or any other exception whatsoever.
-DETAIL:  PL/pgSQL function _cdb_isodistance_exception_safe(geometry,text,integer[],text[]) line 21 at RETURN QUERY
  center | data_range | the_geom 
 --------+------------+----------
 (0 rows)
 
 SELECT * FROM _cdb_route_point_to_point_exception_safe('POINT(-3.70237112 40.41706163)'::geometry,'POINT(-3.69909883 40.41236875)'::geometry, 'car', ARRAY['mode_type=shortest']::text[]);
 WARNING:  cdb_dataservices_client._cdb_route_point_to_point(7): [contrib_regression] REMOTE ERROR: Not enough quota or any other exception whatsoever.
-DETAIL:  SQL statement "SELECT * FROM cdb_dataservices_client._cdb_route_point_to_point(username, orgname, origin, destination, mode, options, units)"
-PL/pgSQL function _cdb_route_point_to_point_exception_safe(geometry,geometry,text,text[],text) line 21 at SQL statement
  shape | length | duration 
 -------+--------+----------
        |        |         
diff --git a/client/test/expected/30_namedplaces_test.out b/client/test/expected/30_namedplaces_test.out
index 28d474c..2460f2b 100644
--- a/client/test/expected/30_namedplaces_test.out
+++ b/client/test/expected/30_namedplaces_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/40_postalcodes_test.out b/client/test/expected/40_postalcodes_test.out
index 9953623..4578fd4 100644
--- a/client/test/expected/40_postalcodes_test.out
+++ b/client/test/expected/40_postalcodes_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/50_ipaddresses_test.out b/client/test/expected/50_ipaddresses_test.out
index 0227648..30bf75e 100644
--- a/client/test/expected/50_ipaddresses_test.out
+++ b/client/test/expected/50_ipaddresses_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/60_street_test.out b/client/test/expected/60_street_test.out
index 80db3ae..7955eeb 100644
--- a/client/test/expected/60_street_test.out
+++ b/client/test/expected/60_street_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/80_route_point_to_point_test.out b/client/test/expected/80_route_point_to_point_test.out
index fe75a88..e6b51d3 100644
--- a/client/test/expected/80_route_point_to_point_test.out
+++ b/client/test/expected/80_route_point_to_point_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/90_data_observatory_test.out b/client/test/expected/90_data_observatory_test.out
index 7373763..d461dde 100644
--- a/client/test/expected/90_data_observatory_test.out
+++ b/client/test/expected/90_data_observatory_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 -- Mock the server functions
diff --git a/client/test/expected/999_permissions_test.out b/client/test/expected/999_permissions_test.out
index 18742f8..a69a009 100644
--- a/client/test/expected/999_permissions_test.out
+++ b/client/test/expected/999_permissions_test.out
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Use regular user role
 SET ROLE test_regular_user;
 -- Add to the search path the schema
diff --git a/client/test/sql/10_admin0_test.sql b/client/test/sql/10_admin0_test.sql
index e6750f1..bc0f005 100644
--- a/client/test/sql/10_admin0_test.sql
+++ b/client/test/sql/10_admin0_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/20_admin1_test.sql b/client/test/sql/20_admin1_test.sql
index ecd2275..458b6c3 100644
--- a/client/test/sql/20_admin1_test.sql
+++ b/client/test/sql/20_admin1_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/25_exception_safe_private_functions_test.sql b/client/test/sql/25_exception_safe_private_functions_test.sql
index ba45130..67d48df 100644
--- a/client/test/sql/25_exception_safe_private_functions_test.sql
+++ b/client/test/sql/25_exception_safe_private_functions_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 SET client_min_messages TO warning;
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/30_namedplaces_test.sql b/client/test/sql/30_namedplaces_test.sql
index bdfba65..ed3acd3 100644
--- a/client/test/sql/30_namedplaces_test.sql
+++ b/client/test/sql/30_namedplaces_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/40_postalcodes_test.sql b/client/test/sql/40_postalcodes_test.sql
index c1c2191..12b2789 100644
--- a/client/test/sql/40_postalcodes_test.sql
+++ b/client/test/sql/40_postalcodes_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/50_ipaddresses_test.sql b/client/test/sql/50_ipaddresses_test.sql
index c1fd8f7..3209d8e 100644
--- a/client/test/sql/50_ipaddresses_test.sql
+++ b/client/test/sql/50_ipaddresses_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/60_street_test.sql b/client/test/sql/60_street_test.sql
index cd22b5e..4e7f695 100644
--- a/client/test/sql/60_street_test.sql
+++ b/client/test/sql/60_street_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/80_route_point_to_point_test.sql b/client/test/sql/80_route_point_to_point_test.sql
index a44ba4b..c63d76b 100644
--- a/client/test/sql/80_route_point_to_point_test.sql
+++ b/client/test/sql/80_route_point_to_point_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/90_data_observatory_test.sql b/client/test/sql/90_data_observatory_test.sql
index b513c25..1508ba2 100644
--- a/client/test/sql/90_data_observatory_test.sql
+++ b/client/test/sql/90_data_observatory_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Add to the search path the schema
 SET search_path TO public,cartodb,cdb_dataservices_client;
 
diff --git a/client/test/sql/999_permissions_test.sql b/client/test/sql/999_permissions_test.sql
index adc0be2..adc649e 100644
--- a/client/test/sql/999_permissions_test.sql
+++ b/client/test/sql/999_permissions_test.sql
@@ -1,3 +1,4 @@
+\set VERBOSITY terse
 -- Use regular user role
 SET ROLE test_regular_user;
 

From 31e79cb6261ea12b83a237fcc594ae503e764d83 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@carto.com>
Date: Wed, 4 Oct 2017 17:10:51 +0200
Subject: [PATCH 3/4] Remove installation of schema_triggers

Schema triggers dependency was deprecated time ago. See
https://github.com/CartoDB/cartodb-postgresql/blob/5d43faecaf5659cbc32f3e9468e10e029ea47cd7/NEWS.md#0120-2016-01-27
---
 client/test/expected/00_installation_test.out | 1 -
 client/test/sql/00_installation_test.sql      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/client/test/expected/00_installation_test.out b/client/test/expected/00_installation_test.out
index 8c6f98d..fe179b7 100644
--- a/client/test/expected/00_installation_test.out
+++ b/client/test/expected/00_installation_test.out
@@ -1,6 +1,5 @@
 -- Install dependencies
 CREATE EXTENSION postgis;
-CREATE EXTENSION schema_triggers;
 CREATE EXTENSION plpythonu;
 CREATE EXTENSION cartodb;
 CREATE EXTENSION plproxy;
diff --git a/client/test/sql/00_installation_test.sql b/client/test/sql/00_installation_test.sql
index fc3395f..f091cd4 100644
--- a/client/test/sql/00_installation_test.sql
+++ b/client/test/sql/00_installation_test.sql
@@ -1,6 +1,5 @@
 -- Install dependencies
 CREATE EXTENSION postgis;
-CREATE EXTENSION schema_triggers;
 CREATE EXTENSION plpythonu;
 CREATE EXTENSION cartodb;
 CREATE EXTENSION plproxy;

From 24c29c08471559c0d071f6aa90bf0d02679fce05 Mon Sep 17 00:00:00 2001
From: Rafa de la Torre <rtorre@carto.com>
Date: Wed, 4 Oct 2017 17:17:13 +0200
Subject: [PATCH 4/4] Make test order execution deterministic

---
 client/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/Makefile b/client/Makefile
index 3930d5d..895f39f 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -21,7 +21,7 @@ DATA = $(NEW_EXTENSION_ARTIFACT) \
 SOURCES_DATA_DIR = sql/
 
 
-REGRESS = $(notdir $(basename $(wildcard test/sql/*test.sql)))
+REGRESS = $(notdir $(basename $(sort $(wildcard test/sql/*test.sql))))
 TEST_DIR = test/
 REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)' --user='postgres'