From b0d614d032b44f45447f909e028c61c2817bb91b Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Thu, 21 Apr 2016 12:10:35 +0200 Subject: [PATCH] More fixes to data observatory integration tests --- .../integration/test_data_observatory_functions.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/test/integration/test_data_observatory_functions.py b/test/integration/test_data_observatory_functions.py index b9062c4..1f4057a 100644 --- a/test/integration/test_data_observatory_functions.py +++ b/test/integration/test_data_observatory_functions.py @@ -15,30 +15,24 @@ class TestDataObservatoryFunctions(TestCase): ) def test_if_get_demographic_snapshot_is_ok(self): - query = "SELECT duration, length, shape as the_geom " \ - "FROM obs_get_demographic_snapshot(CDB_LatLng(40.704512, -73.936669))".format( - self.env_variables['api_key']) + query = "SELECT obs_get_demographic_snapshot(CDB_LatLng(40.704512, -73.936669))".format(self.env_variables['api_key']) routing = IntegrationTestHelper.execute_query(self.sql_api_url, query) assert_not_equal(routing['the_geom'], None) def test_if_get_demographic_snapshot_without_api_key_raise_error(self): - query = "SELECT duration, length, shape as the_geom " \ - "FROM obs_get_demographic_snapshot(CDB_LatLng(40.704512, -73.936669))" + query = "SELECT obs_get_demographic_snapshot(CDB_LatLng(40.704512, -73.936669))" try: IntegrationTestHelper.execute_query(self.sql_api_url, query) except Exception as e: assert_equal(e.message[0], "The api_key must be provided") def test_if_get_segment_snapshot_is_ok(self): - query = "SELECT duration, length, shape as the_geom " \ - "FROM obs_get_segment_snapshot(CDB_LatLng(40.704512, -73.936669))".format( - self.env_variables['api_key']) + query = "SELECT obs_get_segment_snapshot(CDB_LatLng(40.704512, -73.936669))".format(self.env_variables['api_key']) routing = IntegrationTestHelper.execute_query(self.sql_api_url, query) assert_not_equal(routing['the_geom'], None) def test_if_get_segment_snapshot_without_api_key_raise_error(self): - query = "SELECT duration, length, shape as the_geom " \ - "FROM obs_get_segment_snapshot(CDB_LatLng(40.704512, -73.936669))" + query = "SELECT obs_get_segment_snapshot(CDB_LatLng(40.704512, -73.936669))" try: IntegrationTestHelper.execute_query(self.sql_api_url, query) except Exception as e: