(Wangle) Fix Executor problem

[folly.git] / folly / futures / test / ViaTest.cpp

diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp
index 0675baf8b3570169e2b4360120613c7b570aef1a..3ade66790e2b98642ab047c28219e2859041e28c 100644 (file)
--- a/folly/futures/test/ViaTest.cpp
+++ b/folly/futures/test/ViaTest.cpp
@@ -185,11 +185,9 @@ TEST(Via, chain3) {
   EXPECT_EQ(3, count);
 }
 
-// TODO(6838553)
-#ifndef __clang__
 TEST(Via, then2) {
   ManualExecutor x1, x2;
-  bool a,b,c;
+  bool a = false, b = false, c = false;
   via(&x1)
     .then([&]{ a = true; })
     .then(&x2, [&]{ b = true; })
@@ -212,8 +210,11 @@ TEST(Via, then2) {
 }
 
 TEST(Via, then2Variadic) {
-  struct Foo { void foo(Try<void>) {} };
+  struct Foo { bool a = false; void foo(Try<void>) { a = true; } };
   Foo f;
-  makeFuture().then(nullptr, &Foo::foo, &f);
+  ManualExecutor x;
+  makeFuture().then(&x, &Foo::foo, &f);
+  EXPECT_FALSE(f.a);
+  x.run();
+  EXPECT_TRUE(f.a);
 }
-#endif