From 526a449e5deb234bd6235661255a3f611b028871 Mon Sep 17 00:00:00 2001
From: Jacob Beck <jacob@fishtownanalytics.com>
Date: Wed, 18 Jul 2018 14:56:33 -0600
Subject: [PATCH] Cleanup

---
 dbt/adapters/default/impl.py                             | 9 ---------
 .../029_docs_generate_tests/test_docs_generate.py        | 3 ++-
 test/integration/base.py                                 | 7 -------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/dbt/adapters/default/impl.py b/dbt/adapters/default/impl.py
index 4e903ac1a8a..5b91da7c315 100644
--- a/dbt/adapters/default/impl.py
+++ b/dbt/adapters/default/impl.py
@@ -660,15 +660,6 @@ def clear_transaction(cls, profile, conn_name='master'):
         cls.commit(profile, conn)
         return conn_name
 
-    @classmethod
-    def clear_all_transactions(cls, profile):
-        for conn_name, transaction in connections_in_use.items():
-            if transaction.get('transaction_open'):
-                print('found open transaction {}, rolling it back'.format(conn_name))
-                cls.rollback(transaction)
-            print('clearing transaction')
-            cls.clear_transaction(profile, conn_name)
-
     @classmethod
     def execute_one(cls, profile, sql, model_name=None, auto_begin=False):
         cls.get_connection(profile, model_name)
diff --git a/test/integration/029_docs_generate_tests/test_docs_generate.py b/test/integration/029_docs_generate_tests/test_docs_generate.py
index 0231fd79bbc..bd7e05a4142 100644
--- a/test/integration/029_docs_generate_tests/test_docs_generate.py
+++ b/test/integration/029_docs_generate_tests/test_docs_generate.py
@@ -483,6 +483,7 @@ def test__bigquery__nested_models(self):
             },
         }
         self.verify_manifest(expected_manifest)
+
     @use_profile('redshift')
     def test__redshift__run_and_generate(self):
         self.run_and_generate()
@@ -540,7 +541,7 @@ def test__redshift__run_and_generate(self):
             },
         }
         self.verify_catalog(expected_catalog)
-        self.verify_manifest(self.expected_manifest())
+        self.verify_manifest(self.expected_seeded_manifest())
 
     @use_profile('redshift')
     def test__redshift__incremental_view(self):
diff --git a/test/integration/base.py b/test/integration/base.py
index 6ec3d7d09ea..c71e8f076b9 100644
--- a/test/integration/base.py
+++ b/test/integration/base.py
@@ -289,13 +289,6 @@ def use_profile(self, adapter_type):
             self.run_sql('DROP SCHEMA IF EXISTS {} CASCADE'.format(schema))
             self.run_sql('CREATE SCHEMA {}'.format(schema))
 
-    def _reconnect(self):
-        """Disconnect and then reconnect. setUp() must be complete!"""
-        self.handle.close()
-        self.adapter.cleanup_connections()
-        connection = self.adapter.acquire_connection(self._profile, '__test')
-        self.handle = connection.get('handle')
-
     def tearDown(self):
         os.remove(DBT_PROFILES)
         os.remove("dbt_project.yml")