Skip to content

Conversation

davidmorgan
Copy link
Contributor

@davidmorgan davidmorgan commented Oct 14, 2025

I realized the "mock" timestamp handling in the package:watcher tests was not correctly accounting for links, which made the polling tests for links give wrong results.

Various changes to address that.

  • Make use of "mock" timestamps optional, it now must be enabled at the start of the test by calling enableMockModificationTimes. The native watches don't use modification times so they can run entirely without "mock" times.
  • Add a new way to run tests that uses real modification times. To ensure the polling watchers can notice changes, it instead spins updating a separate file until its modification time changes.
  • Run most polling watchers tests both ways.
  • Fix handling of "mock" timestamps when there is a link: resolve symlinks before looking up the timestamp. The fact that the handling matches real timestamp behavior is now tested :)

And, writeFile had unintended behavior when there was a link: it would write through the link instead of replacing the link. Make it replace the file, and add checks to writeFile, renameFile and renameLink that the specified path ends up of the expected type.

Update test expectations in link tests that were incorrect.

Test failures on MacOS on dev SDK are unrelated, they are due to an SDK issue dart-lang/sdk#61693

Copy link

Package publishing

Package Version Status Publish tag (post-merge)
package:bazel_worker 1.1.4 already published at pub.dev
package:benchmark_harness 2.4.0-wip WIP (no publish necessary)
package:boolean_selector 2.1.2 already published at pub.dev
package:browser_launcher 1.1.3 already published at pub.dev
package:cli_config 0.2.1-wip WIP (no publish necessary)
package:cli_util 0.5.0-wip WIP (no publish necessary)
package:clock 1.1.3-wip WIP (no publish necessary)
package:code_builder 4.11.0 already published at pub.dev
package:coverage 1.15.0 already published at pub.dev
package:csslib 1.0.2 already published at pub.dev
package:extension_discovery 2.1.0 already published at pub.dev
package:file 7.0.2-wip WIP (no publish necessary)
package:file_testing 3.1.0-wip WIP (no publish necessary)
package:glob 2.1.3 already published at pub.dev
package:graphs 2.3.3-wip WIP (no publish necessary)
package:html 0.15.6 already published at pub.dev
package:io 1.1.0-wip WIP (no publish necessary)
package:json_rpc_2 4.0.0 already published at pub.dev
package:markdown 7.3.1-wip WIP (no publish necessary)
package:mime 2.0.0 already published at pub.dev
package:oauth2 2.0.4 ready to publish oauth2-v2.0.4
package:package_config 2.3.0-wip WIP (no publish necessary)
package:pool 1.5.2 already published at pub.dev
package:process 5.0.5 already published at pub.dev
package:pub_semver 2.2.0 already published at pub.dev
package:pubspec_parse 1.5.0 already published at pub.dev
package:source_map_stack_trace 2.1.3-wip WIP (no publish necessary)
package:source_maps 0.10.14-wip WIP (no publish necessary)
package:source_span 1.10.1 already published at pub.dev
package:sse 4.1.8 already published at pub.dev
package:stack_trace 1.12.1 already published at pub.dev
package:stream_channel 2.1.4 already published at pub.dev
package:stream_transform 2.1.2-wip WIP (no publish necessary)
package:string_scanner 1.4.1 already published at pub.dev
package:term_glyph 1.2.3-wip WIP (no publish necessary)
package:test_reflective_loader 0.4.0 already published at pub.dev
package:timing 1.0.2 already published at pub.dev
package:unified_analytics 8.0.6 ready to publish unified_analytics-v8.0.6
package:watcher 1.1.5-wip WIP (no publish necessary)
package:yaml 3.1.3 already published at pub.dev
package:yaml_edit 2.2.2 already published at pub.dev

Documentation at https://github.com/dart-lang/ecosystem/wiki/Publishing-automation.

Copy link

github-actions bot commented Oct 14, 2025

PR Health

Breaking changes ✔️
Package Change Current Version New Version Needed Version Looking good?
watcher None 1.1.4 1.1.5-wip 1.1.4 ✔️

This check can be disabled by tagging the PR with skip-breaking-check.

Coverage ✔️
File Coverage
pkgs/watcher/lib/src/stat.dart 💚 100 %

This check for test coverage is informational (issues shown here will not fail the PR).

This check can be disabled by tagging the PR with skip-coverage-check.

API leaks ✔️

The following packages contain symbols visible in the public API, but not exported by the library. Export these symbols or remove them from your publicly visible API.

Package Leaked API symbol Leaking sources

This check can be disabled by tagging the PR with skip-leaking-check.

License Headers ✔️
// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
Files
no missing headers

All source files should start with a license header.

Unrelated files missing license headers
Files
pkgs/bazel_worker/benchmark/benchmark.dart
pkgs/benchmark_harness/integration_test/perf_benchmark_test.dart
pkgs/boolean_selector/example/example.dart
pkgs/clock/lib/clock.dart
pkgs/clock/lib/src/clock.dart
pkgs/clock/lib/src/default.dart
pkgs/clock/lib/src/stopwatch.dart
pkgs/clock/lib/src/utils.dart
pkgs/clock/test/clock_test.dart
pkgs/clock/test/default_test.dart
pkgs/clock/test/stopwatch_test.dart
pkgs/clock/test/utils.dart
pkgs/coverage/lib/src/coverage_options.dart
pkgs/html/example/main.dart
pkgs/html/lib/dom.dart
pkgs/html/lib/dom_parsing.dart
pkgs/html/lib/html_escape.dart
pkgs/html/lib/parser.dart
pkgs/html/lib/src/constants.dart
pkgs/html/lib/src/encoding_parser.dart
pkgs/html/lib/src/html_input_stream.dart
pkgs/html/lib/src/list_proxy.dart
pkgs/html/lib/src/query_selector.dart
pkgs/html/lib/src/token.dart
pkgs/html/lib/src/tokenizer.dart
pkgs/html/lib/src/treebuilder.dart
pkgs/html/lib/src/utils.dart
pkgs/html/test/dom_test.dart
pkgs/html/test/parser_feature_test.dart
pkgs/html/test/parser_test.dart
pkgs/html/test/query_selector_test.dart
pkgs/html/test/selectors/level1_baseline_test.dart
pkgs/html/test/selectors/level1_lib.dart
pkgs/html/test/selectors/selectors.dart
pkgs/html/test/support.dart
pkgs/html/test/tokenizer_test.dart
pkgs/html/test/trie_test.dart
pkgs/html/tool/generate_trie.dart
pkgs/pubspec_parse/test/git_uri_test.dart
pkgs/stack_trace/example/example.dart
pkgs/watcher/test/custom_watcher_factory_test.dart
pkgs/yaml_edit/example/example.dart

This check can be disabled by tagging the PR with skip-license-check.

@davidmorgan davidmorgan force-pushed the link-stamps branch 5 times, most recently from 87aae85 to 55e5ce7 Compare October 14, 2025 11:06
@davidmorgan davidmorgan force-pushed the link-stamps branch 3 times, most recently from 2e654d8 to 7e94f00 Compare October 14, 2025 11:19
@davidmorgan davidmorgan marked this pull request as ready for review October 14, 2025 11:38
@davidmorgan davidmorgan requested a review from a team as a code owner October 14, 2025 11:38
Copy link
Member

@stereotype441 stereotype441 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm assuming review comment is addressed.

var mtime = mockFileModificationTimes[normalized];
return mtime != null ? DateTime.fromMillisecondsSinceEpoch(mtime) : null;
});
addTearDown(() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, wow, I didn't know this function existed. It's so handy. TIL!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, right? :)


File(fullPath).writeAsStringSync(contents);
var file = File(fullPath);
if (FileSystemEntity.typeSync(fullPath, followLinks: false) ==
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment here explaining why this is necessary.

(You explained it nicely in the commit message, but someone reading the code shouldn't have to dig through git history to find it)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me, thanks. Done.

@davidmorgan davidmorgan merged commit 8b9a48c into dart-lang:main Oct 14, 2025
17 of 18 checks passed
@davidmorgan davidmorgan deleted the link-stamps branch October 14, 2025 14:32
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request Oct 16, 2025
Revisions updated by `dart tools/rev_sdk_deps.dart`.

ecosystem (https://github.com/dart-lang/ecosystem/compare/f4fbac4..6a8746e):
  6a8746e  2025-10-13  Moritz  Use newest verion of firehose in publish (dart-lang/ecosystem#378)

http (https://github.com/dart-lang/http/compare/2c53fa3..2cb6c12):
  2cb6c12  2025-10-15  Brian Quinlan  chore(cronet_http): Prepare to release 1.6.0 (dart-lang/http#1833)
  a906598  2025-10-16  Denys Vitali  fix(ok_http): trust manager init (dart-lang/http#1830)
  54dfd63  2025-10-15  Brian Quinlan  docs(cupertino_http): Clarify that happens when a request is cancelled (dart-lang/http#1834)
  3e3c366  2025-10-15  Brian Quinlan  chore(okhttp): Fix CI by setting minSdk=24 (dart-lang/http#1835)
  6271faf  2025-10-13  Benjamin  feat: export MediaType from http_parser (dart-lang/http#1803)
  32dee0c  2025-10-13  Benjamin  chore(cronet_http): bump compileSdkVersion to 34 (dart-lang/http#1832)

tools (https://github.com/dart-lang/tools/compare/adf3fe7..f5920a2):
  f5920a2d  2025-10-16  Morgan :)  Fix `PollingDirectoryWatcher` for delete during poll. (dart-lang/tools#2212)
  289ba0d3  2025-10-15  Morgan :)  Add DirectoryWatcher symlink tests. (dart-lang/tools#2206)
  1275d4c3  2025-10-14  Kevin Moore  Bump deps for graphs, html, process, pubspec_parse (dart-lang/tools#2210)
  8b9a48ca  2025-10-14  Morgan :)  Fix test handling of link timestamps. (dart-lang/tools#2208)
  81588f32  2025-10-14  Abgar Simonean  Update to oauth2 package README for Flutter Web info (dart-lang/tools#1961)

webdev (https://github.com/dart-lang/webdev/compare/186bfe7..2517aa9):
  2517aa94  2025-10-13  Srujan Gaddam  [DWDS] Make pause a no-op on WebSocketProxyService (dart-lang/webdev#2697)

Change-Id: Ifee5e199cf5799aa5962639e686192874f4d58b3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/455480
Auto-Submit: Devon Carew <devoncarew@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants