[ledger-api-test-tool] - Merge KVCommandDeduplicationIT and CommandDe…

…duplicationIT (#12257) changelog_begin [ledger-api-test-tool] - Merge command deduplication ledger API tests (`KVCommandDeduplicationIT`, `CommandDeduplicationIT`) into a single suite(`CommandDeduplicationIT`) which uses feature descriptors to handle different participant behaviors changelog_end
digital-asset · Jan 11, 2022 · 50deee3 · 50deee3
1 parent c7c86d2
commit 50deee3
Show file tree

Hide file tree

Showing 21 changed files with 1,028 additions and 1,212 deletions.
diff --git a/compatibility/bazel_tools/testing.bzl b/compatibility/bazel_tools/testing.bzl
@@ -533,13 +533,24 @@ excluded_test_tool_tests = [
     },
     {
         "start": "1.18.0",
+        "platform_ranges": [
+            {
+                "end": "1.18.0",
+                "exclusions": [
+                    "CommandDeduplicationIT",  # Latest version of the test is dependent on having the submission id populated
+                ],
+            },
+        ],
+    },
+    {
+        "start": "1.18.0",
+        "end": "2.0.0-snapshot.20220105.8777.1",  # was removed in 2.0
         "platform_ranges": [
             {
                 "end": "1.18.0",
                 "exclusions": [
                     # Exclude dedup tests due to large number of changes (removed participant deduplication, switch to append-only schema, changes in deduplication duration)
                     "KVCommandDeduplicationIT",
-                    "CommandDeduplicationIT",  # Latest version of the test is dependent on having the submission id populated
                 ],
             },
         ],
@@ -575,14 +586,13 @@ excluded_test_tool_tests = [
                 "end": "1.18.0",
                 "exclusions": [
                     # Unexpected failure (StatusRuntimeException) ALREADY_EXISTS: DUPLICATE_COMMAND(10,KVComman):
-                    "KVCommandDeduplicationIT:KVCommandDeduplicationSimpleDeduplicationMixedClients",
+                    "CommandDeduplicationIT:DeduplicationMixedClients",
                     # Assertion failed: Expecting completion with status code OK but completion has status Some(Status(6,DUPLICATE_COMMAND(10,972fae4b)
-                    "KVCommandDeduplicationIT:KVCommandDeduplicationSimpleDeduplicationBasic",
+                    "CommandDeduplicationIT:SimpleDeduplicationBasic",
                     # Unexpected failure (StatusRuntimeException) ALREADY_EXISTS: DUPLICATE_COMMAND(10,KVComman):
-                    "KVCommandDeduplicationIT:KVCommandDeduplicationSimpleDeduplicationCommandClient",
+                    "CommandDeduplicationIT:SimpleDeduplicationCommandClient",
                     # Offsets are not supported for versions < 2.0.0
-                    "KVCommandDeduplicationIT:KVCommandDeduplicationDeduplicateUsingOffsets",
-                    "CommandDeduplicationIT:ParticipantCommandDeduplicationDeduplicateUsingOffsets",
+                    "CommandDeduplicationIT:DeduplicateUsingOffsets",
                     # Actual error id (INCONSISTENT) does not match expected error id (DUPLICATE_CONTRACT_KEY}
                     "ExceptionsIT:ExRollbackDuplicateKeyCreated",
                     "ExceptionsIT:ExRollbackDuplicateKeyArchived",

diff --git a/ledger/daml-on-sql/BUILD.bazel b/ledger/daml-on-sql/BUILD.bazel
@@ -119,10 +119,6 @@ conformance_test(
         "--additional=CompletionDeduplicationInfoITCommandService",
         "--additional=CompletionDeduplicationInfoITCommandSubmissionService",
         "--additional=ContractIdIT:Accept",
-        # Exclude offset command deduplication tests
-        # daml-on-sql uses the the sandbox server which has support only for participant side deduplication,
-        # which in turn only has support for durations as deduplication periods
-        "--exclude=CommandDeduplicationIT:ParticipantCommandDeduplicationDeduplicateUsingOffsets",
         # not enforced
         "--exclude=CommandDeduplicationPeriodValidationIT:DeduplicationDurationExceedsMaxDeduplicationDuration",
     ],

diff --git a/ledger/ledger-api-test-tool-on-canton/BUILD.bazel b/ledger/ledger-api-test-tool-on-canton/BUILD.bazel
@@ -88,16 +88,14 @@ conformance_test(
         ",ContractKeysIT:CKFetchOrLookup,ContractKeysIT:CKNoFetchUndisclosed,ContractKeysIT:CKMaintainerScoped" +
         ",ExceptionsIT,ExceptionRaceConditionIT" +  # need UCK mode - added below
         ",DeeplyNestedValueIT" +  # FIXME: Too deeply nested values flake with a time out (half of the time)
-        ",CommandDeduplicationIT:ParticipantCommandDeduplicationSimpleDeduplicationBasic" +  # sync vs async error (part of canton #6301)
-        ",CommandDeduplicationIT:ParticipantCommandDeduplicationDeduplicateSubmitterBasic" +
-        ",CommandDeduplicationIT:ParticipantCommandDeduplicationSimpleDeduplicationMixedClients" +
-        ",CommandDeduplicationIT:ParticipantCommandDeduplicationDeduplicateUsingOffsets" +  # temporary disabled until we adapt it for canton
+        ",CommandDeduplicationIT:SimpleDeduplicationBasic" +  # sync vs async error (part of canton #6301)
+        ",CommandDeduplicationIT:DeduplicateSubmitterBasic" +
+        ",CommandDeduplicationIT:DeduplicateUsingOffsets" +  # temporary disabled until we adapt it for canton
         # Also exclude "optional tests" - which are run separately below
         ",CompletionDeduplicationInfoITCommandService" +
         ",CompletionDeduplicationInfoITCommandSubmissionService" +
         ",CommandDeduplicationParallelIT" +
         ",ContractIdIT" +
-        ",KVCommandDeduplicationIT" +  # only for KV-utils
         ",MultiPartySubmissionIT" +
         ",ParticipantPruningIT" +
         ",TLSOnePointThreeIT" +

diff --git a/ledger/ledger-api-test-tool/BUILD.bazel b/ledger/ledger-api-test-tool/BUILD.bazel
@@ -129,17 +129,19 @@ da_scala_binary(
                 "//ledger/error",
                 "//ledger/ledger-api-common",
                 "//ledger/ledger-resources",
-                "//libs-scala/resources",
-                "//libs-scala/resources-akka",
-                "//libs-scala/resources-grpc",
                 "//ledger/test-common:test-common-%s" % lf_version,
                 "//ledger/test-common:package_management-tests-%s.scala" % lf_version,
                 "//ledger/test-common:model-tests-%s.scala" % lf_version,
                 "//ledger/test-common:performance-tests-%s.scala" % lf_version,
                 "//ledger/test-common:semantic-tests-%s.scala" % lf_version,
                 "//ledger/test-common:dar-files-%s-lib" % lf_version,
+                "//libs-scala/contextualized-logging",
                 "//libs-scala/grpc-utils",
+                "//libs-scala/resources",
+                "//libs-scala/resources-akka",
+                "//libs-scala/resources-grpc",
                 "//libs-scala/timer-utils",
+                "@maven//:com_google_api_grpc_proto_google_common_protos",
                 "@maven//:io_grpc_grpc_api",
                 "@maven//:io_grpc_grpc_context",
                 "@maven//:io_grpc_grpc_netty",
@@ -256,7 +258,6 @@ conformance_test(
         "--additional=LotsOfPartiesIT",
         "--additional=TransactionScaleIT",
         "--additional=TLSOnePointThreeIT",
-        "--exclude=CommandDeduplicationIT",
         # Makes sure that deprecated CLI options can still be used to make sure existing CI pipelines are not broken.
         # This test should fail if any deprecated CLI option has any effect whatsoever -- they are preserved
         # exclusively for backwards-compatibility.

diff --git a/ledger/ledger-api-test-tool/README.md b/ledger/ledger-api-test-tool/README.md
diff --git a/.../ledger-api-test-tool/src/main/scala/com/daml/ledger/api/testtool/LedgerApiTestTool.scala b/.../ledger-api-test-tool/src/main/scala/com/daml/ledger/api/testtool/LedgerApiTestTool.scala
@@ -92,14 +92,9 @@ object LedgerApiTestTool {
 
     val defaultTests: Vector[LedgerTestSuite] = Tests.default(
       timeoutScaleFactor = config.timeoutScaleFactor,
-      ledgerClockGranularity = config.ledgerClockGranularity,
-      staticTime = config.staticTime,
-    )
-    val optionalTests: Vector[LedgerTestSuite] = Tests.optional(
-      timeoutScaleFactor = config.timeoutScaleFactor,
-      ledgerClockGranularity = config.ledgerClockGranularity,
       staticTime = config.staticTime,
     )
+    val optionalTests: Vector[LedgerTestSuite] = Tests.optional()
     val visibleTests: Vector[LedgerTestSuite] = defaultTests ++ optionalTests
     val allTests: Vector[LedgerTestSuite] = visibleTests ++ Tests.retired
     val allTestCaseNames: Set[String] = allTests.flatMap(_.tests).map(_.name).toSet

diff --git a/...st-tool/src/main/scala/com/daml/ledger/api/testtool/infrastructure/FutureAssertions.scala b/...st-tool/src/main/scala/com/daml/ledger/api/testtool/infrastructure/FutureAssertions.scala
@@ -123,22 +123,26 @@ object FutureAssertions {
 
   def forAllParallel[T](
       data: Seq[T]
-  )(testCase: T => Future[Unit])(implicit ec: ExecutionContext): Future[Seq[Unit]] = Future
+  )(
+      testCase: T => Future[Unit]
+  )(implicit ec: ExecutionContext, loggingContext: LoggingContext): Future[Seq[Unit]] = Future
     .traverse(data)(input =>
       testCase(input).map(Right(_)).recover { case NonFatal(ex) =>
         Left(input -> ex)
       }
     )
     .map { results =>
       val (failures, successes) = results.partitionMap(identity)
-      if (failures.nonEmpty)
+      if (failures.nonEmpty) {
+        failures
+          .foreach(res => logger.error(s"Failed parallel test case for input ${res._1}", res._2))
         throw ParallelTestFailureException(
           s"Failed parallel test case. Failures: ${failures.length}. Success: ${successes.length}\nFailed inputs: ${failures
             .map(_._1)
             .mkString("[", ",", "]")}",
           failures.last._2,
         )
-      else successes
+      } else successes
     }
 
   def optionalAssertion(runs: Boolean, description: String)(