Add non-asserting test expectation macros

These fail test instead of killing the process.

Author: DanShaders

tdutils/td/utils/tests.cpp

@@ -213,7 +213,10 @@ bool TestsRunner::run_all_step() {
 
     auto passed = Time::now() - state_.start;
     auto real_passed = Time::now_unadjusted() - state_.start_unadjusted;
-    if (real_passed + 1e-9 > passed) {
+    if (test_failed_) {
+      LOG(ERROR) << "FAILED in " << format::as_time(passed);
+      any_test_failed_ = true;
+    } else if (real_passed + 1e-9 > passed) {
       LOG(ERROR) << format::as_time(passed);
     } else {
       LOG(ERROR) << format::as_time(passed) << " real[" << format::as_time(real_passed) << "]";
@@ -222,12 +225,14 @@ bool TestsRunner::run_all_step() {
       regression_tester_->save_db();
     }
     state_.is_running = false;
+    test_failed_ = false;
     ++state_.it;
   }
 
   auto ret = state_.it != state_.end;
   if (!ret) {
     state_ = State();
+    test_failed_ = false;
   }
   return ret || stress_flag_;
 }
@@ -246,4 +251,13 @@ Status TestsRunner::verify(Slice data) {
   return regression_tester_->verify_test(PSLICE() << name() << "_default", data);
 }
 
+void TestsRunner::register_test_failure() {
+  CHECK(state_.is_running);
+  test_failed_ = true;
+}
+
+bool TestsRunner::any_test_failed() const {
+  return any_test_failed_;
+}
+
 }  // namespace td

tdutils/td/utils/tests.h

@@ -103,6 +103,7 @@ class TestContext : public Context<TestContext> {
   virtual ~TestContext() = default;
   virtual Slice name() = 0;
   virtual Status verify(Slice data) = 0;
+  virtual void register_test_failure() = 0;
 };
 
 class TestsRunner : public TestContext {
@@ -115,6 +116,7 @@ class TestsRunner : public TestContext {
   void run_all();
   bool run_all_step();
   void set_regression_tester(unique_ptr<RegressionTester> regression_tester);
+  bool any_test_failed() const;
 
  private:
   struct State {
@@ -128,10 +130,13 @@ class TestsRunner : public TestContext {
   vector<string> substr_filters_;
   vector<std::pair<string, unique_ptr<Test>>> tests_;
   State state_;
+  std::atomic<bool> test_failed_ = false;
   unique_ptr<RegressionTester> regression_tester_;
+  bool any_test_failed_{false};
 
   Slice name() override;
   Status verify(Slice data) override;
+  void register_test_failure() override;
 };
 
 template <class T>
@@ -238,6 +243,22 @@ std::optional<std::string> check_eq(auto const &a_value, auto const &b_value, ch
     }                                                                                              \
   } while (0)
 
+#define EXPECT(cond)                                                                \
+  do {                                                                              \
+    if (auto error_message = ::td::detail::check(static_cast<bool>(cond), #cond)) { \
+      LOG(ERROR) << *error_message;                                                 \
+      ::td::TestContext::get()->register_test_failure();                            \
+    }                                                                               \
+  } while (0)
+
+#define EXPECT_EQ(a, b)                                              \
+  do {                                                               \
+    if (auto error_message = ::td::detail::check_eq(a, b, #a, #b)) { \
+      LOG(ERROR) << *error_message;                                  \
+      ::td::TestContext::get()->register_test_failure();             \
+    }                                                                \
+  } while (0)
+
 #define REGRESSION_VERIFY(data) ::td::TestContext::get()->verify(data).ensure()
 
 #define TEST_NAME(test_case_name, test_name) \

test/test-td-main.cpp

@@ -50,5 +50,5 @@ int main(int argc, char **argv) {
     }
   }
   runner.run_all();
-  return 0;
+  return runner.any_test_failed() ? 1 : 0;
 }