restore env variables set in the test_failing_configuration. (#733)

Signed-off-by: Tomoya.Fujita <Tomoya.Fujita@sony.com>
ros2 · Aug 5, 2020 · c417f7b · c417f7b
1 parent b0d0143
commit c417f7b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/rcl/test/rcl/test_rmw_impl_id_check_func.cpp b/rcl/test/rcl/test_rmw_impl_id_check_func.cpp
@@ -31,10 +31,12 @@ TEST(TestRmwCheck, test_failing_configuration) {
   const char * get_env_var_name = rcutils_get_env(
     RMW_IMPLEMENTATION_ENV_VAR_NAME,
     &expected_rmw_impl_env);
+  EXPECT_FALSE(get_env_var_name);
 
   const char * get_env_id_matches_name = rcutils_get_env(
     RCL_ASSERT_RMW_ID_MATCHES_ENV_VAR_NAME,
     &expected_rmw_id_matches);
+  EXPECT_FALSE(get_env_id_matches_name);
 
   // Fail test case, reason: RMW_IMPLEMENTATION_ENV_VAR_NAME set, not matching rmw impl
   EXPECT_TRUE(rcutils_set_env(RMW_IMPLEMENTATION_ENV_VAR_NAME, "some_random_name"));
@@ -65,6 +67,6 @@ TEST(TestRmwCheck, test_failing_configuration) {
   rcl_reset_error();
 
   // Restore env variables set in the test
-  EXPECT_TRUE(rcutils_set_env(RMW_IMPLEMENTATION_ENV_VAR_NAME, get_env_var_name));
-  EXPECT_TRUE(rcutils_set_env(RCL_ASSERT_RMW_ID_MATCHES_ENV_VAR_NAME, get_env_id_matches_name));
+  EXPECT_TRUE(rcutils_set_env(RMW_IMPLEMENTATION_ENV_VAR_NAME, expected_rmw_impl_env));
+  EXPECT_TRUE(rcutils_set_env(RCL_ASSERT_RMW_ID_MATCHES_ENV_VAR_NAME, expected_rmw_id_matches));
 }