Make sure mailboxes in test actorsystems are in a locked state (#11837)

2 files changed, 5 insertions, 2 deletions

diff --git a/ydb/core/util/actorsys_test/testactorsys.h b/ydb/core/util/actorsys_test/testactorsys.h
index df7d5bc027..492d1f23a0 100644
--- a/ydb/core/util/actorsys_test/testactorsys.h
+++ b/ydb/core/util/actorsys_test/testactorsys.h
@@ -492,9 +492,12 @@ public:
         }
 
         // register actor in mailbox
-        const auto& it = Mailboxes.try_emplace(TMailboxId(nodeId, poolId, mboxId)).first;
+        auto [it, mboxInserted] = Mailboxes.try_emplace(TMailboxId(nodeId, poolId, mboxId));
         TMailboxInfo& mbox = it->second;
         mbox.Hint = mboxId;
+        if (mboxInserted) {
+            mbox.LockFromFree();
+        }
         mbox.AttachActor(ActorLocalId, actor);
 
         // generate actor id
diff --git a/ydb/library/actors/testlib/test_runtime.cpp b/ydb/library/actors/testlib/test_runtime.cpp
index acf7332c91..daec639296 100644
--- a/ydb/library/actors/testlib/test_runtime.cpp
+++ b/ydb/library/actors/testlib/test_runtime.cpp
@@ -928,7 +928,7 @@ namespace NActors {
         RegistrationObserver(*this, parentId ? parentId : CurrentRecipient, actorId);
         DoActorInit(node->ActorSystem.Get(), actor, actorId, parentId ? parentId : CurrentRecipient);
 
-        mailbox->Unlock(node->ExecutorPools[0], GetCycleCountFast(), revolvingCounter);
+        // Note: test actorsystem mailboxes stay permanently locked
 
         return actorId;
     }