Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 452c0114 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "snoop_logger: Fix leaking socket FDs in tests"

parents 0fd0e4bd fc995c6a

system/gd/hal/snoop_logger_socket_thread_test.cc

+5 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ TEST_F(SnoopLoggerSocketThreadModuleTest, socket_connect_test) { 
  sls.Stop();



  ASSERT_FALSE(sls.ThreadIsRunning());

  close(socket_fd);

}



TEST_F(SnoopLoggerSocketThreadModuleTest, socket_connect_disconnect_test) {
@@ -155,6 +156,7 @@ TEST_F(SnoopLoggerSocketThreadModuleTest, socket_connect_disconnect_test) { 
  sls.Stop();



  ASSERT_FALSE(sls.ThreadIsRunning());

  close(socket_fd);

}



TEST_F(SnoopLoggerSocketThreadModuleTest, socket_send_no_start_test) {
@@ -205,6 +207,7 @@ TEST_F(SnoopLoggerSocketThreadModuleTest, socket_send_before_connect_test) { 
  a.wait();

  bytes_read = a.get();

  ASSERT_EQ(bytes_read, -1);

  close(socket_fd);

}



TEST_F(SnoopLoggerSocketThreadModuleTest, socket_recv_file_header_test) {
@@ -242,6 +245,7 @@ TEST_F(SnoopLoggerSocketThreadModuleTest, socket_recv_file_header_test) { 


  ASSERT_EQ(bytes_read, static_cast<int>(sizeof(SnoopLoggerCommon::FileHeaderType)));

  ASSERT_TRUE(std::memcmp(recv_buf, &SnoopLoggerCommon::kBtSnoopFileHeader, bytes_read) == 0);

  close(socket_fd);

}



TEST_F(SnoopLoggerSocketThreadModuleTest, socket_send_recv_test) {
@@ -286,6 +290,7 @@ TEST_F(SnoopLoggerSocketThreadModuleTest, socket_send_recv_test) { 


  ASSERT_EQ(bytes_read, static_cast<int>(sizeof(test_data)));

  ASSERT_TRUE(std::memcmp(recv_buf2, test_data, bytes_read) == 0);

  close(socket_fd);

}



}  // namespace testing

system/gd/hal/snoop_logger_test.cc

+3 −0
Original line number Diff line number Diff line
@@ -1384,6 +1384,7 @@ TEST_F(SnoopLoggerModuleTest, socket_disabled_connect_fail_test) { 
  ASSERT_TRUE(ret != 0);



  test_registry->StopAll();

  close(socket_fd);

}



TEST_F(SnoopLoggerModuleTest, default_socket_enabled_capture_recv_test) {
@@ -1433,6 +1434,7 @@ TEST_F(SnoopLoggerModuleTest, default_socket_enabled_capture_recv_test) { 
  ASSERT_TRUE(std::memcmp(recv_buf3, kHfpAtNrec0.data(), kHfpAtNrec0.size()) == 0);



  test_registry->StopAll();

  close(socket_fd);

}



TEST_F(SnoopLoggerModuleTest, custom_socket_register_enabled_capture_recv_test) {
@@ -1492,6 +1494,7 @@ TEST_F(SnoopLoggerModuleTest, custom_socket_register_enabled_capture_recv_test) 
  ASSERT_TRUE(std::memcmp(recv_buf3, kHfpAtNrec0.data(), kHfpAtNrec0.size()) == 0);



  test_registry->StopAll();

  close(socket_fd);

}



TEST_F(SnoopLoggerModuleTest, custom_socket_interface_register_logging_disabled_test) {