@@ -172,8 +172,9 @@ struct MainTestCase {
172
172
return config;
173
173
}
174
174
175
- MainTestCase (std::optional<std::string> user = std::nullopt)
176
- : Id(RandomNumber<size_t >())
175
+ MainTestCase (const std::optional<std::string> user = std::nullopt, std::string tableType = " COLUMN" )
176
+ : TableType(std::move(tableType))
177
+ , Id(RandomNumber<size_t >())
177
178
, ConnectionString(GetEnv(" YDB_ENDPOINT" ) + " /?database=" + GetEnv(" YDB_DATABASE" ))
178
179
, TopicName(TStringBuilder() << " Topic_" << Id)
179
180
, SourceTableName(TStringBuilder() << " SourceTable_" << Id)
@@ -256,7 +257,7 @@ struct MainTestCase {
256
257
}
257
258
258
259
void CreateTable (const std::string& tableDDL) {
259
- ExecuteDDL (Sprintf (tableDDL.data (), TableName.data ()));
260
+ ExecuteDDL (Sprintf (tableDDL.data (), TableName.data (), TableType. data () ));
260
261
}
261
262
262
263
void DropTable () {
@@ -613,12 +614,14 @@ struct MainTestCase {
613
614
}
614
615
}
615
616
616
- break ;
617
+ return ;
617
618
}
618
619
619
- UNIT_ASSERT_C (attempt, " Unable to wait transfer result" );
620
620
Sleep (TDuration::Seconds (1 ));
621
621
}
622
+
623
+ CheckTransferState (TReplicationDescription::EState::Running);
624
+ UNIT_ASSERT_C (false , " Unable to wait transfer result" );
622
625
}
623
626
624
627
TReplicationDescription CheckTransferState (TReplicationDescription::EState expected) {
@@ -633,7 +636,8 @@ struct MainTestCase {
633
636
issues = result.GetErrorState ().GetIssues ().ToOneLineString ();
634
637
}
635
638
636
- UNIT_ASSERT_C (i, " Unable to wait transfer state. Expected: " << expected << " , actual: " << result.GetState () << " , " << issues); Sleep (TDuration::Seconds (1 ));
639
+ UNIT_ASSERT_C (i, " Unable to wait transfer state. Expected: " << expected << " , actual: " << result.GetState () << " , " << issues);
640
+ Sleep (TDuration::Seconds (1 ));
637
641
}
638
642
639
643
Y_UNREACHABLE ();
@@ -681,15 +685,16 @@ struct MainTestCase {
681
685
DropTopic ();
682
686
}
683
687
688
+ const std::string TableType;
684
689
const size_t Id;
685
- const TString ConnectionString;
686
-
687
- const TString TopicName;
688
- const TString SourceTableName;
689
- const TString ChangefeedName;
690
- const TString TableName;
691
- const TString ReplicationName;
692
- const TString TransferName;
690
+ const std::string ConnectionString;
691
+
692
+ const std::string TopicName;
693
+ const std::string SourceTableName;
694
+ const std::string ChangefeedName;
695
+ const std::string TableName;
696
+ const std::string ReplicationName;
697
+ const std::string TransferName;
693
698
694
699
TDriver Driver;
695
700
TQueryClient TableClient;
0 commit comments