Skip to content

Commit 32cfd12

Browse files
committed
Added support of YDB_FEATURE_FLAGS
1 parent 871ddc1 commit 32cfd12

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

tests/common/src/main/java/tech/ydb/test/integration/YdbEnvironment.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class YdbEnvironment {
2020
private final Supplier<String> dockerImage = createParam("YDB_DOCKER_IMAGE", YDB_DEFAULT_IMAGE);
2121
private final Supplier<String> dockerDatabase = createParam("YDB_DOCKER_DATABASE", "/local");
2222
private final Supplier<String> dockerPemPath = createParam("YDB_DOCKER_PEM_PATH", "/ydb_certs/ca.pem");
23+
private final Supplier<String> dockerFeatures = createParam("YDB_DOCKER_FEATURE_FLAGS", "");
2324
private final Supplier<Boolean> dockerReuse = createParam("YDB_DOCKER_REUSE", true);
2425

2526
private final Supplier<Boolean> cleanUpTests = createParam("YDB_CLEAN_UP", true);
@@ -62,6 +63,10 @@ public boolean dockerReuse() {
6263
return dockerReuse.get();
6364
}
6465

66+
public String dockerFeatures() {
67+
return dockerFeatures.get();
68+
}
69+
6570
public boolean cleanUpTests() {
6671
return cleanUpTests.get();
6772
}

tests/common/src/main/java/tech/ydb/test/integration/docker/YdbDockerContainer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ public void init() {
5353
}
5454

5555
withEnv("YDB_USE_IN_MEMORY_PDISKS", "true");
56+
57+
if (env.dockerFeatures() != null && !env.dockerFeatures().isEmpty()) {
58+
withEnv("YDB_FEATURE_FLAGS", env.dockerFeatures());
59+
}
60+
5661
withReuse(env.dockerReuse());
5762

5863
String id = "ydb-" + UUID.randomUUID();

tests/common/src/test/java/tech/ydb/test/integration/YdbEnvironmentTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public void rewriteAllParams() {
9292
params.put("YDB_DOCKER_DATABASE", "/remote");
9393
params.put("YDB_DOCKER_PEM_PATH", "/certs/ca.pem");
9494
params.put("YDB_DOCKER_REUSE", "false");
95+
params.put("YDB_DOCKER_FEATURE_FLAGS", "enable_views");
9596

9697
params.put("YDB_DOCKER_ISOLATION", "false");
9798
params.put("YDB_DISABLE_INTEGRATION_TESTS", "tru");
@@ -113,6 +114,7 @@ public void rewriteAllParams() {
113114
Assert.assertEquals("check YDB_DOCKER_DATABASE", "/remote", env.dockerDatabase());
114115
Assert.assertEquals("check YDB_DOCKER_PEM_PATH", "/certs/ca.pem", env.dockerPemPath());
115116
Assert.assertEquals("check YDB_DOCKER_REUSE", false, env.dockerReuse());
117+
Assert.assertEquals("check YDB_DOCKER_FEATURE_FLAGS", "enable_views", env.dockerFeatures());
116118

117119
Assert.assertEquals("check YDB_DISABLE_INTEGRATION_TESTS", false, env.disableIntegrationTests());
118120
// ENV has higher priority

0 commit comments

Comments
 (0)