Fix an issue in psycopg2 contract test that cause random run fail (#112)

*Issue #, if available:*
A racing condition on trace queue that may not be able to clean on time
in some condition

*Description of changes:*
Fix an issue in psycopg2 contract test that cause random run fail

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.

Author: XinRanZhAWS

contract-tests/images/applications/psycopg2/psycopg2_server.py

@@ -20,28 +20,6 @@
 _DB_NAME = os.getenv("DB_NAME")
 
 
-def prepare_database() -> None:
-    conn = psycopg2.connect(dbname=_DB_NAME, user=_DB_USER, password=_DB_PASS, host=_DB_HOST)
-    cur = conn.cursor()
-    cur.execute("DROP TABLE IF EXISTS test_table")
-    cur.execute(
-        """
-        CREATE TABLE test_table (
-            id SERIAL PRIMARY KEY,
-            name TEXT NOT NULL
-            )
-        """
-    )
-
-    cur.execute("INSERT INTO test_table (name) VALUES (%s)", ("Alice",))
-    cur.execute("INSERT INTO test_table (name) VALUES (%s)", ("Bob",))
-
-    conn.commit()
-
-    cur.close()
-    conn.close()
-
-
 class RequestHandler(BaseHTTPRequestHandler):
     @override
     # pylint: disable=invalid-name
@@ -50,13 +28,9 @@ def do_GET(self):
         conn = psycopg2.connect(dbname=_DB_NAME, user=_DB_USER, password=_DB_PASS, host=_DB_HOST)
         if self.in_path(_SUCCESS):
             cur = conn.cursor()
-            cur.execute("SELECT id, name FROM test_table")
-            rows = cur.fetchall()
+            cur.execute("DROP TABLE IF EXISTS test_table")
             cur.close()
-            if len(rows) == 2:
-                status_code = 200
-            else:
-                status_code = 400
+            status_code = 200
         elif self.in_path(_FAULT):
             cur = conn.cursor()
             try:
@@ -81,7 +55,6 @@ def in_path(self, sub_path: str):
 
 
 def main() -> None:
-    prepare_database()
     server_address: Tuple[str, int] = ("0.0.0.0", _PORT)
     request_handler_class: type = RequestHandler
     requests_server: ThreadingHTTPServer = ThreadingHTTPServer(server_address, request_handler_class)

contract-tests/tests/test/amazon/psycopg2/psycopg2_test.py

@@ -51,7 +51,7 @@ def get_application_image_name(self) -> str:
 
     def test_success(self) -> None:
         self.mock_collector_client.clear_signals()
-        self.do_test_requests("success", "GET", 200, 0, 0, sql_command="SELECT")
+        self.do_test_requests("success", "GET", 200, 0, 0, sql_command="DROP TABLE")
 
     def test_fault(self) -> None:
         self.mock_collector_client.clear_signals()