chore: fix flake and assertion for integration test.

Author: karel-rehor

Examples/timeouts.py

@@ -2,18 +2,18 @@
 import sys
 import time
 
-from influxdb_client_3 import InfluxDBClient3, QueryApiOptionsBuilder, WriteOptions, write_client_options
+from influxdb_client_3 import InfluxDBClient3
 
 
 """
 This example shows how to set query and write timeouts.
 They can be set directly using arguments (write_timeout, query_timeout) in the client constructor.
 They can also be overridden in write and query calls.
 
-To trigger timeout and deadline expired exceptions, reset the timeout values in the examples or 
+To trigger timeout and deadline expired exceptions, reset the timeout values in the examples or
 supply new values as command line parameters.
 
-Be sure to update the host, token a database values below, before running this example.     
+Be sure to update the host, token a database values below, before running this example.
 """
 
 DEFAULT_WRITE_TIMEOUT = 30_000  # in milliseconds
@@ -22,49 +22,47 @@
 DEFAULT_TOKEN = 'my-token'
 DEFAULT_DATABASE = 'test-data'
 
-def client_with_timeouts_via_constructor(w_to: int, q_to: int) -> InfluxDBClient3:
-    return InfluxDBClient3(
-        host=DEFAULT_HOST,
-        token=DEFAULT_TOKEN,
-        database=DEFAULT_DATABASE,
-        write_timeout=w_to,
-        query_timeout=q_to
-    )
 
-def client_with_timeouts_via_options(w_to: int, q_to: int) -> InfluxDBClient3:
-    return InfluxDBClient3(
+def main(w_to: int, q_to: int) -> None:
+    print(f"main {w_to}, {q_to}")
+    lp_data = "timeout_example,location=terra fVal=3.14,iVal=42i"
+    with InfluxDBClient3(
         host=DEFAULT_HOST,
         token=DEFAULT_TOKEN,
         database=DEFAULT_DATABASE,
-        write_client_options=write_client_options(
-            write_options=WriteOptions(timeout=w_to)
-        ),
+        write_timeout=w_to,
         query_timeout=q_to
-    )
+    ) as client:
+
+        try:
+            # write with write timeout set in client
+            client.write(record=lp_data)
+            print("First write OK.")
+            time.sleep(1)
+
+            # write overriding client internal write timeout
+            # to force an exception try a _request_timeout value like 1 ms
+            client.write(record=lp_data, _request_timeout=9_000)
+            print("Second write OK.")
+            time.sleep(1)
+        except Exception as e:
+            print(f"Got exception on write: {e}")
+
+        sql = "SELECT * FROM timeout_example"
+
+        try:
+            # query using query timeout set in client
+            result = client.query(sql)
+            print("\nFirst query result\n", result)
+            time.sleep(1)
+
+            # query overriding client internal query timeout
+            # To force an exception try a timeout value like 0.001 seconds
+            result = client.query(sql, timeout=3.0)
+            print("\nSecond query result\n", result)
+        except Exception as e:
+            print(f"Got exception on query: {e}")
 
-def main(w_to: int, q_to: int) -> None:
-    print(f"main {w_to}, {q_to}")
-    lp_data = "timeout_example,location=terra fVal=3.14,iVal=42i"
-    client1 = client_with_timeouts_via_constructor(w_to, q_to)
-
-    # write with write timeout set in client
-    client1.write(record=lp_data)
-    time.sleep(1)
-
-    # write overriding client internal write timeout
-    client1.write(record=lp_data, _request_timeout=9_000)
-    time.sleep(1)
-
-    sql = "SELECT * FROM timeout_example"
-
-    # query using query timeout set in client
-    result = client1.query(sql)
-    print("\nFirst query result\n", result)
-    time.sleep(1)
-
-    # query overriding client internal query timeout
-    result = client1.query(sql, timeout=3.0)
-    print("\nSecond query result\n", result)
 
 if __name__ == "__main__":
     w_ct = DEFAULT_WRITE_TIMEOUT
@@ -76,4 +74,3 @@ def main(w_to: int, q_to: int) -> None:
             q_ct = int(arg)
 
     main(w_ct, q_ct)
-

tests/test_influxdb_client_3_integration.py

@@ -443,10 +443,15 @@ def retry_cb(args, data, excp):
         )
 
         lp = "test_write_timeout,location=harfa fVal=3.14,iVal=42i"
-        # with self.assertRaises(Url3TimeoutError):
         localClient.write(lp, _request_timeout=1)
 
         # wait for batcher attempt last write retry
         time.sleep(0.1)
 
-        print(f"DEBUG ErrorResult {ErrorResult}, retry_ct {retry_ct}")
+        self.assertEqual(retry_ct, 1)
+        self.assertEqual((self.database, 'default', 'ns'), ErrorResult["rt"])
+        self.assertIsNotNone(ErrorResult["rd"])
+        self.assertIsInstance(ErrorResult["rd"], bytes)
+        self.assertEqual(lp, ErrorResult["rd"].decode('utf-8'))
+        self.assertIsNotNone(ErrorResult["rx"])
+        self.assertIsInstance(ErrorResult["rx"], Url3TimeoutError)