Test: verify just vhost folder, not whole directory

(cherry picked from commit 91bcdd9)
(cherry picked from commit 7f07a9c)

# Conflicts:
#	deps/rabbit/test/per_vhost_msg_store_SUITE.erl

Author: dcorbacho

deps/rabbit/app.bzl

@@ -1086,7 +1086,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/per_vhost_msg_store_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "per_vhost_queue_limit_SUITE_beam_files",

deps/rabbit/test/per_vhost_msg_store_SUITE.erl

@@ -9,6 +9,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("amqp_client/include/amqp_client.hrl").
+-include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
 
 -compile(export_all).
 
@@ -109,23 +110,16 @@ storage_deleted_on_vhost_delete(Config) ->
     Vhost1 = ?config(vhost1, Config),
     Channel1 = ?config(channel1, Config),
     Queue1 = declare_durable_queue(Channel1),
-    FolderSize = get_global_folder_size(Config),
+    FolderSize = get_folder_size(Vhost1, Config),
 
     publish_persistent_messages(index, Channel1, Queue1),
     publish_persistent_messages(store, Channel1, Queue1),
-    FolderSizeAfterPublish = get_global_folder_size(Config),
-
-    %% Total storage size increased
-    true = (FolderSize < FolderSizeAfterPublish),
+    ?awaitMatch(true, get_folder_size(Vhost1, Config) > FolderSize, 30000),
 
     ok = rabbit_ct_broker_helpers:delete_vhost(Config, Vhost1),
 
-    %% Total memory reduced
-    FolderSizeAfterDelete = get_global_folder_size(Config),
-    true = (FolderSizeAfterPublish > FolderSizeAfterDelete),
-
     %% There is no Vhost1 folder
-    0 = get_folder_size(Vhost1, Config).
+    ?awaitMatch(0, get_folder_size(Vhost1, Config), 30000).
 
 
 single_vhost_storage_delete_is_safe(Config) ->
@@ -192,10 +186,13 @@ folder_size(Dir) ->
     filelib:fold_files(Dir, ".*", true,
                        fun(F,Acc) -> filelib:file_size(F) + Acc end, 0).
 
+<<<<<<< HEAD
 get_global_folder_size(Config) ->
     BaseDir = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_mnesia, dir, []),
     folder_size(BaseDir).
 
+=======
+>>>>>>> 7f07a9c230 (Test: verify just vhost folder, not whole directory)
 vhost_dir(Vhost, Config) ->
     rabbit_ct_broker_helpers:rpc(Config, 0,
                                  rabbit_vhost, msg_store_dir_path, [Vhost]).