Enable ff for amqp_system_SUITE

rabbitmq · May 10, 2024 · a2b6955 · a2b6955
1 parent bd0471d
commit a2b6955
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/deps/rabbit/test/amqp_system_SUITE.erl b/deps/rabbit/test/amqp_system_SUITE.erl
@@ -87,14 +87,15 @@ end_per_testcase(Testcase, Config) ->
 
 build_dotnet_test_project(Config) ->
     TestProjectDir = filename:join(
-      [?config(data_dir, Config), "fsharp-tests"]),
+                       [?config(data_dir, Config), "fsharp-tests"]),
     Ret = rabbit_ct_helpers:exec(["dotnet", "restore"],
-      [{cd, TestProjectDir}]),
+                                 [{cd, TestProjectDir}]),
     case Ret of
         {ok, _} ->
-            rabbit_ct_helpers:set_config(Config,
-              {dotnet_test_project_dir, TestProjectDir});
-        _ ->
+            rabbit_ct_helpers:set_config(
+              Config, {dotnet_test_project_dir, TestProjectDir});
+        Err ->
+            ct:pal("Error cd to ~s ~p", [TestProjectDir, Err]),
             {skip, "Failed to fetch .NET Core test project dependencies"}
     end.
 
@@ -119,6 +120,8 @@ roundtrip(Config) ->
                  {java, "RoundTripTest"}]).
 
 streams(Config) ->
+    _ = rabbit_ct_broker_helpers:enable_feature_flag(Config,
+                                                     message_containers_store_amqp_v1),
     Ch = rabbit_ct_client_helpers:open_channel(Config),
     amqp_channel:call(Ch, #'queue.declare'{queue = <<"stream_q2">>,
                                            durable = true,

diff --git a/deps/rabbit/test/amqp_system_SUITE_data/fsharp-tests/Program.fs b/deps/rabbit/test/amqp_system_SUITE_data/fsharp-tests/Program.fs
@@ -203,10 +203,10 @@ module Test =
             receiver.SetCredit(100, true)
             let rtd = receiver.Receive()
             assertNotNull rtd
-            assertEqual 3 rtd.MessageAnnotations.Map.Count
             assertTrue (rtd.MessageAnnotations.Map.ContainsKey(Symbol "x-stream-offset"))
             assertTrue (rtd.MessageAnnotations.Map.ContainsKey(Symbol "x-exchange"))
             assertTrue (rtd.MessageAnnotations.Map.ContainsKey(Symbol "x-routing-key"))
+            assertEqual 3 rtd.MessageAnnotations.Map.Count
 
             assertEqual body rtd.Body
             assertEqual rtd.Properties.CorrelationId  corr