add folly::FixedString, a constexpr-usable string with a fixed-size internal buffer

[folly.git] / folly / test / ExceptionWrapperTest.cpp

diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp
index e5e40d0553190cbdb760fc17ebeac085a4f96b55..b1ee6e936d1528a0f39377140e4a90a0d786285c 100644 (file)
--- a/folly/test/ExceptionWrapperTest.cpp
+++ b/folly/test/ExceptionWrapperTest.cpp
@@ -61,9 +61,9 @@ TEST(ExceptionWrapper, throw_test) {
 
   try {
     container[0].throwException();
-  } catch (std::runtime_error& e) {
+  } catch (std::runtime_error& err) {
     std::string expected = "payload";
-    std::string actual = e.what();
+    std::string actual = err.what();
     EXPECT_EQ(expected, actual);
   }
 }
@@ -229,13 +229,9 @@ TEST(ExceptionWrapper, getExceptionPtr_test) {
   EXPECT_THROW(std::rethrow_exception(eptr), IntException);
 
   // Test with empty ew.
-
-  // Disabling pending fix for fbandroid: t13822116
-  /*
   exception_wrapper empty_ew;
   eptr = empty_ew.getExceptionPtr();
-  EXPECT_DEATH(std::rethrow_exception(eptr), "exception");
-  */
+  EXPECT_FALSE(eptr);
 }
 
 TEST(ExceptionWrapper, with_exception_deduction) {