Fix docker tests

Author: srikanthccv

Diff for: tests/opentelemetry-docker-tests/tests/mysql/test_mysql_functional.py

@@ -43,6 +43,7 @@ def setUp(self):
         self._cursor = self._connection.cursor()
 
     def tearDown(self):
+        self._cursor.close()
         self._connection.close()
         MySQLInstrumentor().uninstrument()
         super().tearDown()

Diff for: tests/opentelemetry-docker-tests/tests/postgres/test_aiopg_functional.py

@@ -37,6 +37,7 @@ def async_call(coro):
 
 class TestFunctionalAiopgConnect(TestBase):
     def setUp(self):
+        super().setUp()
         self._tracer = self.tracer_provider.get_tracer(__name__)
         AiopgInstrumentor().instrument(tracer_provider=self.tracer_provider)
         self._connection = async_call(

Diff for: tests/opentelemetry-docker-tests/tests/postgres/test_psycopg_functional.py

@@ -30,7 +30,7 @@
 
 
 class TestFunctionalPsycopg(TestBase):
-    def setU(self):
+    def setUp(self):
         super().setUp()
         self._tracer = self.tracer_provider.get_tracer(__name__)
         Psycopg2Instrumentor().instrument(tracer_provider=self.tracer_provider)
@@ -45,10 +45,8 @@ def setU(self):
         self._cursor = self._connection.cursor()
 
     def tearDown(self):
-        if self._cursor:
-            self._cursor.close()
-        if self._connection:
-            self._connection.close()
+        self._cursor.close()
+        self._connection.close()
         Psycopg2Instrumentor().uninstrument()
         super().tearDown()
 

Diff for: tests/opentelemetry-docker-tests/tests/postgres/test_psycopg_sqlcommenter.py

@@ -40,7 +40,6 @@ def setUp(self):
         self._connection.set_session(autocommit=True)
         self._cursor = self._connection.cursor()
 
-    @classmethod
     def tearDown(self):
         self._cursor.close()
         self._connection.close()

Diff for: tests/opentelemetry-docker-tests/tests/pymysql/test_pymysql_functional.py

@@ -31,8 +31,6 @@
 class TestFunctionalPyMysql(TestBase):
     def setUp(self):
         super().setUp()
-        self._connection = None
-        self._cursor = None
         self._tracer = self.tracer_provider.get_tracer(__name__)
         PyMySQLInstrumentor().instrument()
         self._connection = pymy.connect(
@@ -45,8 +43,8 @@ def setUp(self):
         self._cursor = self._connection.cursor()
 
     def tearDown(self):
-        if self._connection:
-            self._connection.close()
+        self._cursor.close()
+        self._connection.close()
         PyMySQLInstrumentor().uninstrument()
         super().tearDown()