You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/03/31 08:25:50 UTC
[karaf] branch main updated: Fix flaky test
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f3a5dc9 Fix flaky test
new b08e838 Merge pull request #1508 from jbonofre/FLAKY_TESTS
f3a5dc9 is described below
commit f3a5dc9895a7b9e0ab4d78eb35fca41a5712f3ad
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Mar 30 15:14:09 2022 +0200
Fix flaky test
---
.../karaf/itests/ConfigManagedServiceFactoryTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/ConfigManagedServiceFactoryTest.java b/itests/test/src/test/java/org/apache/karaf/itests/ConfigManagedServiceFactoryTest.java
index 0cafad2..3c3a805 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/ConfigManagedServiceFactoryTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/ConfigManagedServiceFactoryTest.java
@@ -66,15 +66,15 @@ public class ConfigManagedServiceFactoryTest extends BaseTest {
+ "config:property-set test1 data1\n"
+ "config:update", new RolePrincipal("manager"));
Configuration config = configAdmin.listConfigurations("(service.factorypid=myconfig2)")[0];
- assertEquals("data1", config.getProcessedProperties(null).get("test1"));
+ assertEquals("data1", config.getProperties().get("test1").toString());
}
private void checkInitialValuesFromFelixConfigAdmin() throws IOException,
InvalidSyntaxException {
Configuration config = readConfig();
assertNotNull("The configuration is null", config);
- assertEquals("data1", config.getProcessedProperties(null).get("test1"));
- assertEquals("data2", config.getProcessedProperties(null).get("test2"));
+ assertEquals("data1", config.getProperties().get("test1").toString());
+ assertEquals("data2", config.getProperties().get("test2").toString());
}
private void checkEditByFactoryPid() throws IOException,
@@ -83,8 +83,8 @@ public class ConfigManagedServiceFactoryTest extends BaseTest {
+ "config:property-set test1 data1new\n" + "config:update",
new RolePrincipal("manager"));
Configuration config = readConfig();
- assertEquals("data1new", config.getProcessedProperties(null).get("test1"));
- assertEquals("data2", config.getProcessedProperties(null).get("test2"));
+ assertEquals("data1new", config.getProperties().get("test1").toString());
+ assertEquals("data2", config.getProperties().get("test2").toString());
}
private void checkEditByArbitraryAttribute() throws IOException,
@@ -93,8 +93,8 @@ public class ConfigManagedServiceFactoryTest extends BaseTest {
+ "config:property-set test1 data1new2\n" + "config:update",
new RolePrincipal("manager"));
Configuration config = readConfig();
- assertEquals("data1new2", config.getProcessedProperties(null).get("test1"));
- assertEquals("data2", config.getProcessedProperties(null).get("test2"));
+ assertEquals("data1new2", config.getProperties().get("test1").toString());
+ assertEquals("data2", config.getProperties().get("test2").toString());
}
private Configuration readConfig() throws IOException,