commit b033cee8add53dd538e602ca066815d55d052d43
author Andrew Davies <awdavies@google.com> Wed Jan 16 17:45:37 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Jan 18 06:17:56 2019 +0000
tree 2bdfb2e4f4db2e9c0b1e4b1b4658f4fecc9374a2
parent cb747acff0653679b81f043df8bade08e73be876

[test_driver_module] Removes nested env.

The nested env broke /hub visibility of the child processes. This will
now no longer be an issue for tests.

DX-919 #done
DX-710 #comment

TEST: topaz integration tests.
Change-Id: I6a83d63a4ac11161b6c778330e96453100e15654

bin/test_driver/test_driver_module.cc

diff --git a/bin/test_driver/test_driver_module.cc b/bin/test_driver/test_driver_module.cc
index 26d1644..2580de3 100644
--- a/bin/test_driver/test_driver_module.cc
+++ b/bin/test_driver/test_driver_module.cc
@@ -21,8 +21,6 @@
 
 namespace {
 
-// The name of the test driver's environment.
-constexpr char kEnvironmentName[] = "test_driver_env";
 // The name of the test driver's child module.
 constexpr char kSubModuleName[] = "test_driver_sub_module";
 
@@ -94,16 +92,9 @@
     return true;
   }
 
-  bool CreateNestedEnv() {
-    module_host_->startup_context()->environment()->CreateNestedEnvironment(
-        test_driver_env_.NewRequest(), test_driver_env_controller_.NewRequest(),
-        kEnvironmentName,
-        /*additional_services=*/nullptr, {.inherit_parent_services = true});
-    return true;
-  }
-
   void CreateTestDriverComponent(const std::string& url) {
-    test_driver_env_->GetLauncher(test_driver_launcher_.NewRequest());
+    module_host_->startup_context()->environment()->GetLauncher(
+        test_driver_launcher_.NewRequest());
     fuchsia::sys::LaunchInfo launch_info;
     launch_info.url = url;
     launch_info.directory_request = test_driver_services_.NewRequest();
@@ -132,9 +123,6 @@
           FXL_LOG(INFO) << "TestDriverModule launching test driver for URL: "
                         << test_driver_url;
 
-          if (!CreateNestedEnv()) {
-            return;
-          }
           CreateTestDriverComponent(test_driver_url);
           test_driver_component_controller_.events().OnTerminated =
               [this](int64_t return_code,
@@ -156,8 +144,6 @@
 
   component::Services test_driver_services_;
   fuchsia::modular::LinkPtr link_;
-  fuchsia::sys::EnvironmentPtr test_driver_env_;
-  fuchsia::sys::EnvironmentControllerPtr test_driver_env_controller_;
   fuchsia::sys::LauncherPtr test_driver_launcher_;
   fuchsia::sys::ComponentControllerPtr test_driver_component_controller_;