More testing

Author: srujzs

dwds/lib/src/utilities/dart_uri.dart

@@ -168,21 +168,26 @@ class DartUri {
   /// We store this here because for tests we may want to act as if we're
   /// running in the directory of a target package, even if the current
   /// directory of the tests is actually the main dwds directory.
-  static String get currentDirectory => _currentDirectory;
-
-  // TODO(srujzs): This is temporary to debug test failures and avoid analysis
-  // issues. Remove.
-  static bool tmp = false;
+  static String get currentDirectory {
+    print('Getting current directory: $_currentDirectory');
+    return _currentDirectory;
+  }
 
   static set currentDirectory(String newDir) {
+    print('Setting current directory: $newDir');
     _currentDirectory = newDir;
-    if (tmp) _currentDirectoryUri = '${p.toUri(newDir)}';
+    print('Setting current directory uri: ${p.toUri(newDir)}');
+    _currentDirectoryUri = '${p.toUri(newDir)}';
   }
 
   static String _currentDirectoryUri = '${p.toUri(currentDirectory)}';
 
-  /// The current directory as a file: Uri, saved here to avoid re-computing.
-  static String get currentDirectoryUri => _currentDirectoryUri;
+  /// The current directory as a file: Uri, saved in a field to avoid
+  /// re-computing.
+  static String get currentDirectoryUri {
+    print('Getting current directory uri: $_currentDirectoryUri');
+    return _currentDirectoryUri;
+  }
 
   /// Record library and script uris to enable resolving library and script paths.
   static Future<void> initialize() async {

dwds/test/fixtures/context.dart

@@ -541,6 +541,7 @@ class TestContext {
     await _webDriver?.quit(closeSession: true);
     _chromeDriver?.kill();
     DartUri.currentDirectory = p.current;
+    print('Setting currentDirectory in tearDown: ${DartUri.currentDirectory}');
     await _daemonClient?.close();
     await ddcService?.stop();
     await _webRunner?.stop();

test_common/lib/utilities.dart

@@ -16,10 +16,8 @@ const newDdcTypeSystemVersion = '3.3.0-242.0.dev';
 /// '/workstation/webdev'.
 String get webdevPath {
   final pathParts = p.split(p.current);
+  print('Path parts: $pathParts');
   // We expect all tests to be run from the webdev mono-repo:
-  // TODO(srujzs): This is just to debug the failures on https://github.com/dart-lang/webdev/pull/2627.
-  // Delete when done debugging.
-  print(pathParts);
   assert(pathParts.contains(webdevDirName));
   return p.joinAll(
     pathParts.sublist(0, pathParts.lastIndexOf(webdevDirName) + 1),