From afb6315758755a2a32616debf20c647c00777970 Mon Sep 17 00:00:00 2001
From: cnathe <cnathe@labkey.com>
Date: Fri, 13 Jun 2025 17:16:33 -0500
Subject: [PATCH] Skip audit diff checks based on
 TestProperties.isTrialServer() - backport from develop

---
 .../test/components/ui/entities/EntityBulkUpdateDialog.java    | 3 ++-
 src/org/labkey/test/components/ui/grids/DetailTableEdit.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
index 14716f277d..a0401f67b7 100644
--- a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
+++ b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
@@ -4,6 +4,7 @@
 import org.labkey.remoteapi.CommandException;
 import org.labkey.test.BootstrapLocators;
 import org.labkey.test.Locator;
+import org.labkey.test.TestProperties;
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.WebTestHelper;
 import org.labkey.test.components.Component;
@@ -390,7 +391,7 @@ public void clickUpdate(boolean skipAuditEventCheck)
         // check for the expected number of Data Changes in the latest audit event records
         AuditLogHelper auditLogHelper = new AuditLogHelper(getWrapper(), () -> WebTestHelper.getRemoteApiConnection(false));
         String auditEventName = auditLogHelper.getAuditEventNameFromURL();
-        if (!skipAuditEventCheck && auditEventName != null)
+        if (!skipAuditEventCheck && auditEventName != null && !TestProperties.isTrialServer())
         {
             try
             {
diff --git a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
index 0e0c3afbc9..ec4f0fa610 100644
--- a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
+++ b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
@@ -4,6 +4,7 @@
 import org.labkey.remoteapi.CommandException;
 import org.labkey.test.BootstrapLocators;
 import org.labkey.test.Locator;
+import org.labkey.test.TestProperties;
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.WebTestHelper;
 import org.labkey.test.components.Component;
@@ -511,7 +512,7 @@ public DetailDataPanel clickSave(boolean skipAuditEventCheck)
         // check for the expected number of Data Changes in the latest audit event records
         AuditLogHelper auditLogHelper = new AuditLogHelper(getWrapper(), () -> WebTestHelper.getRemoteApiConnection(false));
         String auditEventName = auditLogHelper.getAuditEventNameFromURL();
-        if (!skipAuditEventCheck && auditEventName != null)
+        if (!skipAuditEventCheck && auditEventName != null && !TestProperties.isTrialServer())
         {
             try
             {