Try activating loom tests

Author: tglane

.github/workflows/loom.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: ["master", "tokio-*.x"]
+    branches: ["*"]
   pull_request:
     types: [labeled, opened, synchronize, reopened]
     branches: ["master", "tokio-*.x"]
@@ -26,7 +26,7 @@ jobs:
   loom-sync:
     name: loom tokio::sync
     # base_ref is null when it's not a pull request
-    if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-sync') || (github.base_ref == null))
+    # if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-sync') || (github.base_ref == null))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
   loom-time-driver:
     name: loom time driver
     # base_ref is null when it's not a pull request
-    if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-time-driver') || (github.base_ref == null))
+    # if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-time-driver') || (github.base_ref == null))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
   loom-current-thread:
     name: loom current-thread scheduler
     # base_ref is null when it's not a pull request
-    if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-current-thread') || (github.base_ref == null))
+    # if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-current-thread') || (github.base_ref == null))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
   loom-multi-thread:
     name: loom multi-thread scheduler
     # base_ref is null when it's not a pull request
-    if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-multi-thread') || (github.base_ref == null))
+    # if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-multi-thread') || (github.base_ref == null))
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -99,7 +99,7 @@ jobs:
   loom-multi-thread-alt:
     name: loom ALT multi-thread scheduler
     # base_ref is null when it's not a pull request
-    if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-multi-thread-alt') || (github.base_ref == null))
+    # if: github.repository_owner == 'tokio-rs' && (contains(github.event.pull_request.labels.*.name, 'R-loom-multi-thread-alt') || (github.base_ref == null))
     runs-on: ubuntu-latest
     strategy:
       matrix:

tokio-util/src/sync/tests/loom_cancellation_token.rs

@@ -174,3 +174,49 @@ fn cancel_parent_and_child() {
         assert_ok!(th3.join());
     });
 }
+
+#[test]
+fn run_until_cancelled_completes() {
+    loom::model(|| {
+        block_on(async {
+            let token = CancellationToken::new();
+
+            let fut = async {
+                tokio::time::sleep(std::time::Duration::from_millis(500)).await;
+                42
+            };
+
+            if let Some(res) = token.run_until_cancelled(fut).await {
+                assert!(res, 42);
+            } else {
+                // Should not happen since we are not cancelling the token
+                assert!(false);
+            }
+        });
+    });
+}
+
+#[test]
+fn run_until_cancelled_with_cancel() {
+    loom::model(|| {
+        block_on(async {
+            let token = CancellationToken::new();
+            let token1 = token.clone();
+
+            let th1 = std::thread::spawn(move || {
+                std::time::sleep(std::time::Duration::from_millis(500));
+                token1.cancel();
+            });
+
+            if let None = token.run_until_cancelled(std::future::pending).await {
+                assert!(true);
+            } else {
+                // This branch should not be entered since we cancel the token before the future
+                // finishes
+                assert!(false);
+            }
+
+            assert_ok!(th1.join());
+        });
+    });
+}