Simplify integration tests (rethinkdb#41)

gabor-boros · Adam Grandquist · commit 00d8a0078cf3 · 2018-09-03T12:16:34.000-07:00
* Extend logger to be able to write to stdout/stderr Description Adding functionality to the logger to be able to write to stdout/stderr. This feature was requested in https://github.com/RebirthDB/rebirthdb-python/pull/9/files/8328cc1a20e57615da7163cd50148e5042741bdc#diff-565263873ac3f2f37ce9d01ee9bd638a * Simplify integration tests Description Integration tests containes unused variables and other, not needed stuff, like `teardown_methods`. Note: Tear down methods are not needed in most of the cases, due to we are removing the DB itself at the end of every test. * Remove not necessary tear_down
diff --git a/tests/integration/test_cursor.py b/tests/integration/test_cursor.py
@@ -1,7 +1,7 @@
 import pytest
 
 from rebirthdb.errors import ReqlCursorEmpty
-from tests.helpers import IntegrationTestCaseBase, INTEGRATION_TEST_DB
+from tests.helpers import IntegrationTestCaseBase
 
 
 @pytest.mark.integration
@@ -18,10 +18,6 @@ def setup_method(self):
             {'id': 5, 'name': 'Testing Cursor/Next 5'},
         ]
 
-    def teardown_method(self):
-        self.r.table_drop(self.table_name).run(self.conn)
-        super(TestCursor, self).teardown_method()
-
     def test_get_next_document(self):
         self.r.table(self.table_name).insert(self.documents).run(self.conn)
         documents = list()
diff --git a/tests/integration/test_database.py b/tests/integration/test_database.py
@@ -5,9 +5,9 @@
 
 
 @pytest.mark.integration
-class TestCursorFor(IntegrationTestCaseBase):
+class TestDatabase(IntegrationTestCaseBase):
     def setup_method(self):
-        super(TestCursorFor, self).setup_method()
+        super(TestDatabase, self).setup_method()
         self.test_db_name = 'test_database'
 
     def test_db_create(self):
diff --git a/tests/integration/test_table.py b/tests/integration/test_table.py
@@ -12,7 +12,6 @@ def setup_method(self):
 
     def test_table_create(self):
         result = self.r.table_create(self.test_table_name).run(self.conn)
-        self.r.table_drop(self.test_table_name).run(self.conn)
 
         assert result['tables_created'] == 1
         assert len(result['config_changes']) == 1
@@ -28,7 +27,6 @@ def test_table_different_primary_key(self):
         expected_primary_key = 'bazinga'
 
         result = self.r.table_create(self.test_table_name, primary_key=expected_primary_key).run(self.conn)
-        self.r.table_drop(self.test_table_name).run(self.conn)
 
         assert result['tables_created'] == 1
         assert len(result['config_changes']) == 1
@@ -38,7 +36,6 @@ def test_table_multiple_shards(self):
         expected_shards = 2
 
         result = self.r.table_create(self.test_table_name, shards=expected_shards).run(self.conn)
-        self.r.table_drop(self.test_table_name).run(self.conn)
 
         assert result['tables_created'] == 1
         assert len(result['config_changes']) == 1
@@ -48,7 +45,6 @@ def test_table_create_with_replicas(self):
         expected_replicas = 1
 
         result = self.r.table_create(self.test_table_name, replicas=expected_replicas).run(self.conn)
-        self.r.table_drop(self.test_table_name).run(self.conn)
 
         assert result['tables_created'] == 1
         assert len(result['config_changes']) == 1
@@ -67,8 +63,6 @@ def test_table_create_twice(self):
         with pytest.raises(ReqlRuntimeError):
             self.r.table_create(self.test_table_name).run(self.conn)
 
-        self.r.table_drop(self.test_table_name).run(self.conn)
-
     def test_table_drop(self):
         self.r.table_create(self.test_table_name).run(self.conn)
 
