Skip to content

Commit 8ac0cb9

Browse files
committed
Fix up paths
1 parent 4426bc3 commit 8ac0cb9

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

dwds/test/fixtures/context.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,12 @@ class TestContext {
322322
_webRunner = ResidentWebRunner(
323323
mainUri: entry,
324324
urlTunneler: debugSettings.urlEncoder,
325-
projectDirectory: p.toUri(project.absolutePackageDirectory),
325+
projectDirectory: Directory(project.absolutePackageDirectory).uri,
326326
packageConfigFile: project.packageConfigFile,
327327
packageUriMapper: packageUriMapper,
328-
fileSystemRoots: [p.toUri(project.absolutePackageDirectory)],
328+
fileSystemRoots: [
329+
Directory(project.absolutePackageDirectory).uri,
330+
],
329331
fileSystemScheme: 'org-dartlang-app',
330332
outputPath: outputDir.path,
331333
compilerOptions: compilerOptions,

dwds/test/fixtures/project.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ class TestProject {
2222
late Directory _fixturesCopy;
2323

2424
/// The top level directory in which we run the test server, e.g.
25-
/// "/tmp/_testSound/".
25+
/// "/tmp/_testSound".
2626
String get absolutePackageDirectory =>
27-
// Return it as a directory with a trailing slash.
28-
Directory.fromUri(
29-
_fixturesCopy.absolute.uri.resolve(packageDirectory),
30-
).uri.path;
27+
_fixturesCopy.absolute.uri.resolve(packageDirectory).path;
3128

3229
/// The directory to build and serve, e.g. "example".
3330
String get directoryToServe => p.split(webAssetsPath).first;
@@ -243,7 +240,6 @@ class TestProject {
243240
try {
244241
_fixturesCopy.deleteSync(recursive: true);
245242
} on FileSystemException catch (_) {
246-
assert(Platform.isWindows);
247243
// On Windows, the build daemon process might still be accessing the
248244
// working directory, so try again with an exponential backoff.
249245
var seconds = 1;

0 commit comments

Comments
 (0)