This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 3723c324ec fix: Change opc ua e2e tests (#3784)
3723c324ec is described below
commit 3723c324ecf6e7ae9e0e15e5e94afdae4b04ff80
Author: Philipp Zehnder <[email protected]>
AuthorDate: Wed Sep 24 08:11:41 2025 +0200
fix: Change opc ua e2e tests (#3784)
* fix: Change opc ua e2e tests
* fix: Add another wait for reload
* fix: For failing tests change default opc ua name
* refactor: Change default port back
* fix: Do not use latest version of opc ua test container
---
docker-compose.yml | 4 ++--
.../cli/deploy/standalone/opcua/docker-compose.yml | 2 +-
ui/cypress/support/utils/connect/OpcUaUtils.ts | 21 ++++++++++++++++++++-
.../static-tree-input-button-menu.component.html | 1 +
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index ceed4e4b81..6135ce4f3e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,7 +70,7 @@ services:
spnet:
couchdb:
- image: couchdb:2.3.1
+ image: couchdb:3.3.1
environment:
- COUCHDB_USER=admin
- COUCHDB_PASSWORD=admin
@@ -127,7 +127,7 @@ services:
spnet:
opcua:
- image: mcr.microsoft.com/iotedge/opc-plc
+ image: mcr.microsoft.com/iotedge/opc-plc:2.12.37
logging: *default-logging
command: --ut=true
networks:
diff --git a/installer/cli/deploy/standalone/opcua/docker-compose.yml
b/installer/cli/deploy/standalone/opcua/docker-compose.yml
index 5611c90875..3b284bd171 100644
--- a/installer/cli/deploy/standalone/opcua/docker-compose.yml
+++ b/installer/cli/deploy/standalone/opcua/docker-compose.yml
@@ -15,7 +15,7 @@
services:
opcua:
- image: mcr.microsoft.com/iotedge/opc-plc
+ image: mcr.microsoft.com/iotedge/opc-plc:2.12.37
ports:
- 50000:50000
command: --ut=true
diff --git a/ui/cypress/support/utils/connect/OpcUaUtils.ts
b/ui/cypress/support/utils/connect/OpcUaUtils.ts
index e007119445..56d9308b60 100644
--- a/ui/cypress/support/utils/connect/OpcUaUtils.ts
+++ b/ui/cypress/support/utils/connect/OpcUaUtils.ts
@@ -41,7 +41,26 @@ export class OpcUaUtils {
cy.dataCy('reloading-nodes', { timeout: 3000 }).should('not.exist');
ErrorMessageUtils.getExceptionComponent().should('not.exist');
- StaticPropertyUtils.input(adapterInput.adapterConfiguration);
+ // The opc ua tests started to become flaky, therefore I split up the
configurations of tree and non tree configs
+ // First the adapter is configured, then the tree is loaded before the
tree configurations are added
+ const nonTreeConfigs = adapterInput.adapterConfiguration.filter(
+ config => config.type !== 'tree',
+ );
+ StaticPropertyUtils.input(nonTreeConfigs);
+
+ this.reloadTreeNodeSelection();
+
+ const treeConfigs = adapterInput.adapterConfiguration.filter(
+ config => config.type === 'tree',
+ );
+ StaticPropertyUtils.input(treeConfigs);
+ }
+
+ public static reloadTreeNodeSelection() {
+ cy.dataCy('reloading-nodes', { timeout: 10000 }).should('not.exist');
+ cy.dataCy('reload-tree-node-selection-btn').click();
+ cy.dataCy('reloading-nodes', { timeout: 10000 }).should('exist');
+ cy.dataCy('reloading-nodes', { timeout: 10000 }).should('not.exist');
}
public static getAdapterBuilderWithTreeNodes(pullMode: boolean) {
diff --git
a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
index 4e6b8f55c8..987cf887e7 100644
---
a/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
+++
b/ui/src/app/core-ui/static-properties/static-runtime-resolvable-tree-input/static-tree-input-button-menu/static-tree-input-button-menu.component.html
@@ -37,6 +37,7 @@
style="margin-right: 10px"
*ngIf="editorMode === 'tree'"
[disabled]="!showOptions"
+ data-cy="reload-tree-node-selection-btn"
>
<span>{{ 'Reload' | translate }}</span>
</button>
