Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Dmitry Razumov committed Jan 3, 2025
1 parent 58689d5 commit 8e0fea2
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

#include <cloud/blockstore/libs/diagnostics/block_digest.h>
#include <cloud/blockstore/libs/diagnostics/profile_log.h>
#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/storage/api/disk_agent.h>
#include <cloud/blockstore/libs/storage/api/disk_registry_proxy.h>
#include <cloud/blockstore/libs/storage/api/volume.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/protos/disk.pb.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/disk_agent_mock.h>

#include <cloud/storage/core/libs/common/sglist_test.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
#include <cloud/blockstore/libs/diagnostics/block_digest.h>
#include <cloud/blockstore/libs/diagnostics/critical_events.h>
#include <cloud/blockstore/libs/diagnostics/profile_log.h>
#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/storage/api/disk_agent.h>
#include <cloud/blockstore/libs/storage/api/disk_registry_proxy.h>
#include <cloud/blockstore/libs/storage/api/volume.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/protos/disk.pb.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/disk_agent_mock.h>

#include <cloud/storage/core/libs/common/sglist_test.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TNonreplicatedPartitionMigrationActor::TNonreplicatedPartitionMigrationActor(
NActors::TActorId statActorId)
: TNonreplicatedPartitionMigrationCommonActor(
static_cast<IMigrationOwner*>(this),
std::move(config),
config,
std::move(diagnosticsConfig),
srcConfig->GetName(),
srcConfig->GetBlockCount(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@

#include <cloud/blockstore/libs/diagnostics/block_digest.h>
#include <cloud/blockstore/libs/diagnostics/profile_log.h>
#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/rdma_test/client_test.h>
#include <cloud/blockstore/libs/storage/api/disk_agent.h>
#include <cloud/blockstore/libs/storage/api/volume.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/disk_agent/actors/direct_copy_actor.h>
#include <cloud/blockstore/libs/storage/protos/disk.pb.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/disk_agent_mock.h>
#include <cloud/storage/core/libs/common/sglist_test.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
#include "ut_env.h"

#include <cloud/blockstore/libs/common/block_checksum.h>
#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/rdma_test/client_test.h>
#include <cloud/blockstore/libs/service_local/rdma_protocol.h>
#include <cloud/blockstore/libs/storage/api/disk_agent.h>
#include <cloud/blockstore/libs/storage/api/stats_service.h>
#include <cloud/blockstore/libs/storage/api/volume.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/protos/disk.pb.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/disk_agent_mock.h>

#include <cloud/storage/core/libs/common/sglist_test.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

#include <cloud/blockstore/libs/common/block_checksum.h>
#include <cloud/blockstore/libs/common/iovector.h>
#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/storage/api/disk_agent.h>
#include <cloud/blockstore/libs/storage/api/stats_service.h>
#include <cloud/blockstore/libs/storage/api/volume.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/protos/disk.pb.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/disk_agent_mock.h>
#include <cloud/storage/core/libs/common/sglist_test.h>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

#include <cloud/blockstore/libs/common/block_checksum.h>
#include <cloud/blockstore/libs/diagnostics/block_digest.h>
#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/storage/api/disk_agent.h>
#include <cloud/blockstore/libs/storage/api/stats_service.h>
#include <cloud/blockstore/libs/storage/api/volume.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/protos/disk.pb.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/disk_agent_mock.h>

#include <cloud/storage/core/libs/common/sglist_test.h>
Expand Down
2 changes: 1 addition & 1 deletion cloud/blockstore/libs/storage/testlib/diagnostics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace NCloud::NBlockStore {

inline TDiagnosticsConfigPtr CreateDiagnosticsConfig()
TDiagnosticsConfigPtr CreateDiagnosticsConfig()
{
NProto::TDiagnosticsConfig diagnosticsConfig;
diagnosticsConfig.SetReportHistogramAsMultipleCounters(true);
Expand Down
2 changes: 1 addition & 1 deletion cloud/blockstore/libs/storage/testlib/diagnostics.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

namespace NCloud::NBlockStore {

inline TDiagnosticsConfigPtr CreateDiagnosticsConfig();
TDiagnosticsConfigPtr CreateDiagnosticsConfig();

} // namespace NCloud::NBlockStore
1 change: 1 addition & 0 deletions cloud/blockstore/libs/storage/testlib/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ LIBRARY(blockstore-libs-storage-testlib)

SRCS(
counters_printer.cpp
diagnostics.cpp
disk_agent_mock.cpp
disk_registry_proxy_mock.cpp
service_client.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ TShadowDiskActor::TShadowDiskActor(
const TActiveCheckpointInfo& checkpointInfo)
: TNonreplicatedPartitionMigrationCommonActor(
static_cast<IMigrationOwner*>(this),
std::move(config),
config,
std::move(diagnosticConfig),
srcConfig->GetName(),
srcConfig->GetBlockCount(),
Expand Down
2 changes: 1 addition & 1 deletion cloud/blockstore/libs/storage/volume/volume_state_ut.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "volume_state.h"

#include <cloud/blockstore/libs/diagnostics/ut_helpers.h>
#include <cloud/blockstore/libs/kikimr/events.h>
#include <cloud/blockstore/libs/storage/core/config.h>
#include <cloud/blockstore/libs/storage/partition_nonrepl/config.h>
#include <cloud/blockstore/libs/storage/testlib/diagnostics.h>
#include <cloud/blockstore/libs/storage/testlib/ut_helpers.h>

#include <library/cpp/testing/unittest/registar.h>
Expand Down

0 comments on commit 8e0fea2

Please sign in to comment.