Cache current directory at context creation

Author: srujzs

dwds/test/fixtures/context.dart

@@ -129,14 +129,21 @@ class TestContext {
   /// External VM service.
   VmService get vmService => debugConnection.vmService;
 
-  TestContext(this.project, this.sdkConfigurationProvider);
+  final String _savedCurrentDirectory;
+
+  TestContext(this.project, this.sdkConfigurationProvider)
+    : _savedCurrentDirectory = p.current;
 
   Future<void> setUp({
     TestSettings testSettings = const TestSettings(),
     TestAppMetadata appMetadata = const TestAppMetadata.externalApp(),
     TestDebugSettings debugSettings = const TestDebugSettings.noDevTools(),
   }) async {
     try {
+      // The frontend server modifies the current path. Make sure that we
+      // restore it every time the context is set up so that if a previous
+      // test failed to tear down, we don't affect future tests.
+      DartUri.currentDirectory = _savedCurrentDirectory;
       // Build settings to return from load strategy.
       final buildSettings = TestBuildSettings(
         appEntrypoint: project.dartEntryFilePackageUri,

test_common/lib/utilities.dart

@@ -15,9 +15,7 @@ const newDdcTypeSystemVersion = '3.3.0-242.0.dev';
 /// The path to the webdev directory in the local machine, e.g.
 /// '/workstation/webdev'.
 String get webdevPath {
-  // Use `Directory.current` instead of `p.current` as the latter is allowed to
-  // change with `DartUri.currentDirectory` modifications.
-  final pathParts = p.split(Directory.current.path);
+  final pathParts = p.split(p.current);
   assert(pathParts.contains(webdevDirName));
   return p.joinAll(
     pathParts.sublist(0, pathParts.lastIndexOf(webdevDirName) + 1),