Skip to content

Conditionalize postgres-specific upgrade checks #7489

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-tchad merged 1 commit into from
Mar 12, 2026
Merged

Conditionalize postgres-specific upgrade checks #7489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions core/test/src/org/labkey/test/tests/upgrade/EncryptionKeyUpgradeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.labkey.test.Locators;
import org.labkey.test.WebTestHelper;
import org.labkey.test.WebTestHelper.DatabaseType;
import org.labkey.test.pages.ConfigureReportsAndScriptsPage;
import org.labkey.test.pages.ConfigureReportsAndScriptsPage.EngineType;
import org.labkey.test.pages.admin.RConfigurationPage;
Expand Down Expand Up @@ -42,10 +44,13 @@ protected void doSetup()
.setEngineOverrides(DUMMY_R_SERVE, DUMMY_R_SERVE)
.save();

// Set StatusCake api key
EditUpgradeMessagePage.beginAt(this)
.setStatusCakeApiKey("password")
.save();
if (WebTestHelper.getDatabaseType() == DatabaseType.PostgreSQL)
{
// Set StatusCake api key
EditUpgradeMessagePage.beginAt(this)
.setStatusCakeApiKey("password")
.save();
}
}

@Test
Expand All @@ -64,9 +69,12 @@ public void testDummyRemoteREngine()
@Test
public void testStatusCakeApiKey()
{
// Just loading this page can trigger an error if there was a problem with the encryption
assertEquals("StatusCake API key input should be present but blank",
"", EditUpgradeMessagePage.beginAt(this).getStatusCakeApiKey());
if (WebTestHelper.getDatabaseType() == DatabaseType.PostgreSQL)
{
// Just loading this page can trigger an error if there was a problem with the encryption
assertEquals("StatusCake API key input should be present but blank",
"", EditUpgradeMessagePage.beginAt(this).getStatusCakeApiKey());
}
}

@Override
Expand Down
Loading