Skip to content
Snippets Groups Projects
Verified Commit b05ab59b authored by Timm Fitschen's avatar Timm Fitschen
Browse files

TST: update tests for server release 0.12.0

parent c0264199
No related branches found
No related tags found
No related merge requests found
Pipeline #57674 failed
......@@ -53,13 +53,19 @@ TEST(test_async, retrieve_non_existing) {
auto status = transaction->GetStatus();
EXPECT_EQ(status.GetCode(), StatusCode::EXECUTING);
// wait some time
std::this_thread::sleep_for(1000ms);
// 1000ms are not always sufficient, when there is very high pipeline load.
auto count = 1000;
auto code = transaction->GetStatus().GetCode();
do {
// wait some time
std::this_thread::sleep_for(10ms);
// DONT call WaitForIt -> the transaction finishes in the back-ground
status = transaction->GetStatus();
EXPECT_EQ(status.GetCode(), TransactionStatus::TRANSACTION_ERROR().GetCode());
ASSERT_EQ(status.GetCode(), StatusCode::GENERIC_TRANSACTION_ERROR);
// DONT call WaitForIt -> the transaction finishes in the background
code = transaction->GetStatus().GetCode();
} while (--count > 0 && code == StatusCode::EXECUTING);
ASSERT_GT(count, 0) << "ERROR: Timeout while waiting for transaction.";
EXPECT_EQ(code, TransactionStatus::TRANSACTION_ERROR().GetCode());
ASSERT_EQ(code, StatusCode::GENERIC_TRANSACTION_ERROR);
const auto &result_set = transaction->GetResultSet();
......
......@@ -363,9 +363,7 @@ TEST_F(test_select, test_select_property_unit) {
EXPECT_EQ(query_transaction->GetResultTable().size(), 1);
for (const auto &row : query_transaction->GetResultTable().GetRows()) {
// Fails due to https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/issues/264
EXPECT_NONFATAL_FAILURE({ EXPECT_EQ(row.GetValue("TestPropDouble.unit").GetAsString(), "m"); },
"TestPropDouble.unit");
EXPECT_EQ(row.GetValue("TestPropDouble.unit").GetAsString(), "m");
}
}
......
......@@ -1342,11 +1342,9 @@ TEST_F(test_transaction, test_delete_string_id) {
EXPECT_TRUE(transaction->GetStatus().IsTerminated());
EXPECT_TRUE(transaction->GetStatus().IsError());
const auto &results = transaction->GetResultSet();
EXPECT_FALSE(results.at(0).HasErrors());
EXPECT_TRUE(results.at(1).HasErrors());
EXPECT_EQ(results.at(1).GetErrors().size(), 1);
EXPECT_EQ(results.at(1).GetErrors().at(0).GetDescription(), "Entity does not exist.");
EXPECT_FALSE(results.at(2).HasErrors());
}
} // namespace caosdb::transaction
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment