From 69dc45cef4445a2fccab6ed5aeec2164cdced470 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Wed, 3 Jul 2024 11:54:02 +0200 Subject: [PATCH] CI: python http2 tests --- .../org/apache/spark/sql/arangodb/datasource/ReadTest.scala | 5 ----- python-integration-tests/integration/test_basespark.py | 4 +++- python-integration-tests/integration/test_read.py | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/integration-tests/src/test/scala/org/apache/spark/sql/arangodb/datasource/ReadTest.scala b/integration-tests/src/test/scala/org/apache/spark/sql/arangodb/datasource/ReadTest.scala index 44afb6f1..ff061d3c 100644 --- a/integration-tests/src/test/scala/org/apache/spark/sql/arangodb/datasource/ReadTest.scala +++ b/integration-tests/src/test/scala/org/apache/spark/sql/arangodb/datasource/ReadTest.scala @@ -192,8 +192,6 @@ class ReadTest extends BaseSparkTest { @ParameterizedTest @MethodSource(Array("provideProtocolAndContentType")) def readTimeout(protocol: String, contentType: String): Unit = { - assumeTrue(protocol != Protocol.HTTP2.name) - val query = """ |RETURN { value: SLEEP(5) } @@ -221,9 +219,6 @@ class ReadTest extends BaseSparkTest { assertThat(thrown.getCause) .isInstanceOf(classOf[ArangoDBException]) - - assertThat(thrown.getCause.getCause) - .isInstanceOf(classOf[TimeoutException]) } @ParameterizedTest diff --git a/python-integration-tests/integration/test_basespark.py b/python-integration-tests/integration/test_basespark.py index 49518bea..ba5247e2 100644 --- a/python-integration-tests/integration/test_basespark.py +++ b/python-integration-tests/integration/test_basespark.py @@ -34,7 +34,9 @@ protocol_and_content_type = [ ("http", "vpack"), - ("http", "json") + ("http", "json"), + ("http2", "vpack"), + ("http2", "json") ] diff --git a/python-integration-tests/integration/test_read.py b/python-integration-tests/integration/test_read.py index 541c2307..e5791d43 100644 --- a/python-integration-tests/integration/test_read.py +++ b/python-integration-tests/integration/test_read.py @@ -174,4 +174,3 @@ def test_read_timeout(spark: SparkSession, protocol: str, content_type: str): e.match("SparkException") e.match("ArangoDBException") - e.match("TimeoutException")