Revert "Reland "[FedCM] Adding disconnect to reset test state.""

thefrog-gh · foolip · commit fce706f06979 · 2025-08-13T23:18:45.000+07:00
This reverts commit 11d83f664aba9ed9f977e946c7cd5df8817c955e. Reason for revert: Causing failing tests detailed in crbug.com/41482163 comments #26, #27, #28. Bug: 41482163 Original change's description: > Reland "[FedCM] Adding disconnect to reset test state." > > This is a reland of commit 35632c9ba41725c5fabdb14ea66b00af64f83796 > > Original change's description: > > [FedCM] Adding disconnect to reset test state. > > > > Test results are affected because of previously run tests. > > Disconnect helps in resetting the test state for each test case. > > > > Bug: 41482163 > > Change-Id: Ib97c2ff69ba0d01f886947c0969190c778bb7986 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6780242 > > Commit-Queue: Christian Biesinger <cbiesinger@chromium.org> > > Commit-Queue: Jaimukund Bhan <bhanjaimukund@gmail.com> > > Reviewed-by: Nicolás Peña <npm@chromium.org> > > Reviewed-by: Christian Biesinger <cbiesinger@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1491540} > > Bug: 41482163 > Change-Id: Ib7702a52ea5215993e74ea696d7bbf19a505a98b > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6784548 > Commit-Queue: Jaimukund Bhan <bhanjaimukund@gmail.com> > Reviewed-by: Christian Biesinger <cbiesinger@chromium.org> > Reviewed-by: Nicolás Peña <npm@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1491717} Bug: 41482163 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I6dfb9aa2f05c1ad00f3b12515243c51d6f37632a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6788532 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: thefrog <thefrog@chromium.org> Auto-Submit: thefrog <thefrog@chromium.org> Cr-Commit-Position: refs/heads/main@{#1492021}
diff --git a/fedcm/fedcm-authz/fedcm-disclosure-text-shown.https.html b/fedcm/fedcm-authz/fedcm-disclosure-text-shown.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <title>Federated Credential Management API network request tests.</title>
-<meta name="timeout" content="long">
 <link rel="help" href="https://fedidcg.github.io/FedCM">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/fedcm/fedcm-context.https.html b/fedcm/fedcm-context.https.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <title>Federated Credential Management API context tests.</title>
-<meta name="timeout" content="long">
 <link rel="help" href="https://fedidcg.github.io/FedCM">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
diff --git a/fedcm/fedcm-multi-idp/fedcm-too-many-idps.https.html b/fedcm/fedcm-multi-idp/fedcm-too-many-idps.https.html
@@ -22,7 +22,7 @@
       nonce: '2'
     });
   }
-  return promise_rejects_js(t, TypeError, navigator.credentials.get({
+  assert_throws_js(TypeError, navigator.credentials.get({
     identity: {
       providers: providers,
     }
diff --git a/fedcm/fedcm-storage-access-api-autogrant.tentative.https.sub.html b/fedcm/fedcm-storage-access-api-autogrant.tentative.https.sub.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <title>Federated Credential Management API / Storage Access API autogrants tests.</title>
-<meta name="timeout" content="long">
 <link rel="help" href="https://fedidcg.github.io/FedCM">
 <link rel="help" href="https://privacycg.github.io/storage-access/">
 <script src="/resources/testharness.js"></script>
diff --git a/fedcm/support/fedcm-helper.sub.js b/fedcm/support/fedcm-helper.sub.js
@@ -130,27 +130,20 @@ export function fedcm_test(test_func, test_name) {
   promise_test(async t => {
     assert_implements(window.IdentityCredential, "FedCM is not supported");
 
+    try {
+      await navigator.credentials.preventSilentAccess();
+    } catch (ex) {
+      // In Chrome's content_shell, the promise will be rejected
+      // even though the part we care about succeeds.
+    }
+
     // Turn off delays that are not useful in tests.
     try {
       await test_driver.set_fedcm_delay_enabled(false);
     } catch (e) {
       // Failure is not critical; it just might slow down tests.
     }
 
-    t.add_cleanup(async () => {
-      try {
-        await IdentityCredential.disconnect(alt_disconnect_options(""));
-      } catch (ex){
-        // Failure is not critical, test state is reset.
-      }
-
-      try {
-        await IdentityCredential.disconnect(disconnect_options(""));
-      } catch (ex){
-        // Failure is not critical, test state is reset.
-      }
-    });
-
     await set_fedcm_cookie();
     await set_alt_fedcm_cookie();
     await test_func(t);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`nonce: '2'`
`23`	`23`	`});`
`24`	`24`	`}`
`25`		`- return promise_rejects_js(t, TypeError, navigator.credentials.get({`
	`25`	`+ assert_throws_js(TypeError, navigator.credentials.get({`
`26`	`26`	`identity: {`
`27`	`27`	`providers: providers,`
`28`	`28`	`}`