From 08fdcad28235b2ae4fe974bd32589189f3c9c474 Mon Sep 17 00:00:00 2001 From: Jacob Beck Date: Fri, 26 Apr 2019 13:49:50 -0600 Subject: [PATCH] prevent getting this helper method collected as a test --- .../007_graph_selection_tests/test_graph_selection.py | 2 +- .../test_external_reference.py | 4 ++-- test/integration/base.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/integration/007_graph_selection_tests/test_graph_selection.py b/test/integration/007_graph_selection_tests/test_graph_selection.py index 5c830e360d5..7057b40f9b0 100644 --- a/test/integration/007_graph_selection_tests/test_graph_selection.py +++ b/test/integration/007_graph_selection_tests/test_graph_selection.py @@ -11,7 +11,7 @@ def models(self): return "test/integration/007_graph_selection_tests/models" def assert_correct_schemas(self): - with self.test_connection(): + with self.get_connection(): exists = self.adapter.check_schema_exists( self.default_database, self.unique_schema() diff --git a/test/integration/037_external_reference_test/test_external_reference.py b/test/integration/037_external_reference_test/test_external_reference.py index ba6bf73bdb6..4682f1c0b59 100644 --- a/test/integration/037_external_reference_test/test_external_reference.py +++ b/test/integration/037_external_reference_test/test_external_reference.py @@ -29,7 +29,7 @@ def tearDown(self): # This has to happen before we drop the external schema, because # otherwise postgres hangs forever. self._drop_schemas() - with self.test_connection(): + with self.get_connection(): self.adapter.drop_schema(self.default_database, self.external_schema) super(TestExternalReference, self).tearDown() @@ -55,7 +55,7 @@ def tearDown(self): # This has to happen before we drop the external schema, because # otherwise postgres hangs forever. self._drop_schemas() - with self.test_connection(): + with self.get_connection(): self.adapter.drop_schema(self.default_database, self.external_schema) super(TestExternalDependency, self).tearDown() diff --git a/test/integration/base.py b/test/integration/base.py index e1c77954b37..83cf03901ee 100644 --- a/test/integration/base.py +++ b/test/integration/base.py @@ -562,7 +562,7 @@ def run_sql(self, query, fetch='None', kwargs=None, connection_name=None): sql = self.transform_sql(query, kwargs=kwargs) - with self.test_connection(connection_name) as conn: + with self.get_connection(connection_name) as conn: logger.debug('test connection "{}" executing: {}'.format(conn.name, sql)) if self.adapter_type == 'bigquery': return self.run_sql_bigquery(sql, fetch) @@ -631,7 +631,7 @@ def filter_many_columns(self, column): return (table_name, column_name, data_type, char_size) @contextmanager - def test_connection(self, name=None): + def get_connection(self, name=None): """Create a test connection context where all executed macros, etc will get self.adapter as the adapter. @@ -645,7 +645,7 @@ def test_connection(self, name=None): yield conn def get_relation_columns(self, relation): - with self.test_connection(): + with self.get_connection(): columns = self.adapter.get_columns_in_relation(relation) return sorted(((c.name, c.dtype, c.char_size) for c in columns), @@ -811,7 +811,7 @@ def assertManyRelationsEqual(self, relations, default_schema=None, default_datab specs.append(relation) - with self.test_connection(): + with self.get_connection(): column_specs = self.get_many_relation_columns(specs) # make sure everyone has equal column definitions