From 081c54b41110045858cb1eccf63cb508e52b1d81 Mon Sep 17 00:00:00 2001 From: Moritz Kiefer Date: Wed, 2 Jun 2021 18:20:19 +0200 Subject: [PATCH] Revert "Try to unflake JSON API failure tests (#9855)" (#9887) This has made things worse not better. Now tests that should be successful hit the timeout. Still not sure what is actually going wrong so marking it as flaky Tracked in #9886 changelog_begin changelog_end --- ledger-service/http-json/BUILD.bazel | 2 ++ .../http-json/src/failure/resources/application.conf | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 ledger-service/http-json/src/failure/resources/application.conf diff --git a/ledger-service/http-json/BUILD.bazel b/ledger-service/http-json/BUILD.bazel index fa92d9fdf0..776dcc76a4 100644 --- a/ledger-service/http-json/BUILD.bazel +++ b/ledger-service/http-json/BUILD.bazel @@ -364,6 +364,8 @@ alias( "//ledger/test-common/test-certificates", "@toxiproxy_dev_env//:bin/toxiproxy-cmd" if not is_windows else "@toxiproxy_dev_env//:toxiproxy-server-windows-amd64.exe", ], + # See https://github.com/digital-asset/daml/issues/9886 + flaky = True, plugins = [ "@maven//:org_typelevel_kind_projector_{}".format(scala_version_suffix), ], diff --git a/ledger-service/http-json/src/failure/resources/application.conf b/ledger-service/http-json/src/failure/resources/application.conf deleted file mode 100644 index ae117b0615..0000000000 --- a/ledger-service/http-json/src/failure/resources/application.conf +++ /dev/null @@ -1,6 +0,0 @@ -akka { - # Reducing this should hopefully ensure that the tests - # that test for timeouts always hit the server side request timeout - # and not another timeout somewhere in akka-http. - http.server.request-timeout = 5 s -}