simonbence commented on code in PR #7661: URL: https://github.com/apache/nifi/pull/7661#discussion_r1351838491
########## nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithDifferentFlow.java: ########## @@ -236,20 +172,9 @@ private void verifyInMemoryFlowContents() throws NiFiClientException, IOExceptio assertEquals("65b8f293-016e-1000-7b8f-6c6752fa921b", affectedComponent.getId()); assertEquals(AffectedComponentDTO.COMPONENT_TYPE_PROCESSOR, affectedComponent.getReferenceType()); - // The original Controller Service, whose UUID ended with 00 should be removed and a new one inherited. - final ControllerServicesEntity controllerLevelServices = node2Client.getFlowClient().getControllerServices(); - assertEquals(1, controllerLevelServices.getControllerServices().size()); - - final ControllerServiceEntity firstService = controllerLevelServices.getControllerServices().iterator().next(); - assertFalse(firstService.getId().endsWith("00")); - } - - private PropertyEncryptor createEncryptorFromProperties(Properties properties) { - final NiFiProperties niFiProperties = NiFiProperties.createBasicNiFiProperties(null, properties); - - final String propertiesKey = niFiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_KEY); - final String propertiesAlgorithm = niFiProperties.getProperty(NiFiProperties.SENSITIVE_PROPS_ALGORITHM); - return new PropertyEncryptorBuilder(propertiesKey).setAlgorithm(propertiesAlgorithm).build(); + final ControllerServicesEntity controllerLevelServices = getNifiClient().getFlowClient(DO_NOT_REPLICATE).getControllerServices(); + final Set<ControllerServiceEntity> controllerServices = controllerLevelServices.getControllerServices(); + assertEquals(2, controllerServices.size()); Review Comment: I think that is correct. The original test had assertion to check for 1 Controller Service. As I mentioned there are a lot of moving parts (prod code, test code, test data) but based on what I did see, there is a behaviour in difference compared to the XML. I created a ticket for this: https://issues.apache.org/jira/browse/NIFI-12203 I will push a commit soon in order to adjust the test. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@nifi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org