Fixing tests.

brave · May 12, 2022 · aafa710 · aafa710
1 parent ab40d46
commit aafa710
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/browser/tor/brave_local_state_browsertest.cc b/browser/tor/brave_local_state_browsertest.cc
@@ -22,7 +22,7 @@ IN_PROC_BROWSER_TEST_F(BraveLocalStateBrowserTest, BasicTest) {
 }
 
 IN_PROC_BROWSER_TEST_F(BraveLocalStateBrowserTest, ChangeTest) {
-  TorProfileServiceFactory::SetTorDisabled(false);
+  TorProfileServiceFactory::SetTorDisabled(true);
   EXPECT_TRUE(TorProfileServiceFactory::IsTorDisabled());
 
   tor::BridgesConfig bridges_config;

diff --git a/browser/tor/brave_tor_browsertest.cc b/browser/tor/brave_tor_browsertest.cc
@@ -169,6 +169,13 @@ class BraveTorTest : public InProcessBrowserTest {
     }
   }
 
+  void WaitProcessExit(int pid) {
+    base::Process p = base::Process::Open(pid);
+    if (p.IsValid()) {
+      p.WaitForExit(nullptr);
+    }
+  }
+
   void WaitProcessExit(const std::string& name) {
     while (base::GetProcessCount(base::FilePath::FromASCII(name).value(),
                                  nullptr)) {
@@ -194,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(BraveTorTest, OpenCloseDisableTorWindow) {
         tor_browser, ui_test_utils::BrowserChangeObserver::ChangeType::kRemoved)
         .Wait();
 
-    EXPECT_FALSE(base::Process::Open(tor.tor_pid).IsValid());
+    WaitProcessExit(tor.tor_pid);
   }
 
   // Disable tor, expect executables are removed.

diff --git a/components/tor/brave_tor_pluggable_transport_updater.cc b/components/tor/brave_tor_pluggable_transport_updater.cc
@@ -29,7 +29,7 @@ constexpr const char kComponentName[] = "Brave Pluggable Transports (Linux)";
 #endif
 
 constexpr const char kSnowflakeExecutableName[] = "tor-snowflake-brave";
-constexpr const char kObfs4ExecutableName[] = "tor-obsf4-brave";
+constexpr const char kObfs4ExecutableName[] = "tor-obfs4-brave";
 
 bool Initialize(const base::FilePath& install_dir) {
   const auto executables = {install_dir.AppendASCII(kSnowflakeExecutableName),

diff --git a/...godegbighbamaclcfgo/1.0.0/tor-obsf4-brave → ...godegbighbamaclcfgo/1.0.0/tor-obfs4-brave b/...godegbighbamaclcfgo/1.0.0/tor-obsf4-brave → ...godegbighbamaclcfgo/1.0.0/tor-obfs4-brave