Skip to content

Fix some recent/intermittent teamcity test failures #2389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-chrisj merged 4 commits into from
Apr 4, 2025
Merged

Fix some recent/intermittent teamcity test failures #2389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dce1c90
Attempt to fix NabAssayTest failure
labkey-chrisj Apr 2, 2025
3b77d46
Attempt to fix SimpleModuleTest failure
labkey-chrisj Apr 3, 2025
93071e5
Merge branch 'release25.3-SNAPSHOT' into 25.3_fb_runQcPageTiming
labkey-chrisj Apr 4, 2025
75a35d2
Log the character set
labkey-chrisj Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/org/labkey/test/WebDriverWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
Expand Down Expand Up @@ -460,6 +461,7 @@ protected Pair<WebDriver, DriverService> createNewWebDriver(@NotNull Pair<WebDri
String browserVersion = caps.getBrowserVersion();
log("Browser: " + browserName + " " + browserVersion);
log("Started browser with TZ = " + targetBrowserTimeZone + (targetBrowserTimeZone != ZoneId.systemDefault() ? "" : " (system default)"));
log(String.format("charset is %s", Charset.defaultCharset().displayName()));

return result;
}
Expand Down
13 changes: 11 additions & 2 deletions src/org/labkey/test/pages/assay/RunQCPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.labkey.test.pages.assay;

import org.labkey.test.Locator;
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.components.PlateGrid;
import org.labkey.test.pages.LabKeyPage;
import org.labkey.test.selenium.LazyWebElement;
Expand All @@ -35,6 +36,14 @@ public RunQCPage(WebDriver driver){
_driver = driver;
}

@Override
protected void waitForPage()
{
Locator waitMsg = Locator.tagWithClass("div", "x4-mask-msg-text").withText("Requesting QC information");
WebDriverWrapper.waitFor(()-> !waitMsg.isDisplayed(getDriver()),
"Took too long to display the page", WAIT_FOR_JAVASCRIPT);
}

public WebElement getSpecimenSection(String sectionTitle)
{
String xpath = elementCache().DILUTION_SUMMARY_XPATH + "//tbody//tr//td[text()='" + sectionTitle + "']";
Expand Down Expand Up @@ -74,7 +83,7 @@ public void selectPlateItemsToIgnore(String plateTitle, List<String> valuesToIgn
String xpath = elementCache().PLATE_CONTROLS_VALUES_XPATH.replace("$", plateTitle);
for(String value : valuesToIgnore)
{
click(Locator.xpath(xpath + "//label[text()='" + value + "']"));
waitAndClick(Locator.xpath(xpath + "//label[text()='" + value + "']"));
}
}

Expand All @@ -83,7 +92,7 @@ public void selectDilutionItemsToIgnore(String sectionTitle, List<String> values
String xpath = elementCache().DILUTION_SUMMARY_VALUES_XPATH.replace("$", sectionTitle);
for(String value : valuesToIgnore)
{
click(Locator.xpath(xpath + "//label[text()='" + value + "']"));
waitAndClick(Locator.xpath(xpath + "//label[text()='" + value + "']"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/SimpleModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ private void submitAndTestExpectedFailure(Command cmd, String expectedError) thr
@LogMethod
private void doTestCustomFolder()
{
clickProject(getProjectName());
goToProjectHome();
PortalHelper portalHelper = new PortalHelper(this);

assertTextPresentInThisOrder("A customized web part", "Data Pipeline", "Experiment Runs", "Sample Type", "Assay List");
Expand Down