Merge branch 'develop' into dev-update_dependabot

Xiangs18 · Xiangs18 · commit 8afa50d80d82 · 2025-06-20T13:35:01.000-07:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
            sed -i "s#^auth_token1 =.*#auth_token1 = $KBASE_CI_TOKEN#" test.cfg
            sed -i "s#^auth_token2 =.*#auth_token2 = $KBASE_CI_TOKEN2#" test.cfg
            sed -i "s#^auth_user1 =.*#auth_user1 = kbase_bot#" test.cfg
-           sed -i "s#^auth_user2 =.*#auth_user2 = sychan168#" test.cfg
+           sed -i "s#^auth_user2 =.*#auth_user2 = local_kbase_bot#" test.cfg
            sed -i "s#^good_users =.*#good_users = kbasetest2   ,    kbasetest7   , kbasehelp#" test.cfg
 
            ./gradlew test
diff --git a/src/test/java/us/kbase/test/auth/client/AuthClientTest.java b/src/test/java/us/kbase/test/auth/client/AuthClientTest.java
@@ -61,12 +61,12 @@ public void constructFailNullURI() throws Exception {
 	@Test
 	public void constructFailBadUrl200() throws Exception {
 		// this test is fragile, the exception message might need tweaking
-		final String text = "<!doctype html><html lang=\"en\"><head>"
-				+ "<script async src=\"https://www.googletagmanager.com/gtag/js?...";
-		final String err = "Failed reading from auth url https://ci.kbase.us/services/authx/ "
+		final String text = "<!doctype html>\n<html>\n<head>\n    "
+				+ "<title>Example Domain</title>\n\n    <meta charset=\"utf-8\" />\n   ...";
+		final String err = "Failed reading from auth url https://example.org "
 				+ "with response code 200 - response is not JSON: " + text;
 		assertThat("text is too long", text.length(), is(100));
-		failConstruct(new URI("https://ci.kbase.us/services/authx/"), new AuthException(err));
+		failConstruct(new URI("https://example.org"), new AuthException(err));
 		assertThat("no logs", LOGS.isEmpty(), is(true));
 	}
 	
