|
8 | 8 |
|
9 | 9 | package org.elasticsearch.packaging.test; |
10 | 10 |
|
11 | | -import org.apache.http.client.fluent.Request; |
12 | 11 | import org.elasticsearch.packaging.util.Distribution; |
13 | 12 | import org.elasticsearch.packaging.util.FileUtils; |
14 | 13 | import org.elasticsearch.packaging.util.ServerUtils; |
@@ -45,15 +44,10 @@ public static void filterDistros() { |
45 | 44 | } |
46 | 45 |
|
47 | 46 | public void test10Install() throws Exception { |
48 | | - // security config tool would run as administrator and change the owner of the config file, which is elasticsearch |
49 | | - // We can re-enable this when #77231 is merged, but the rest of the tests in class are also currently muted on windows |
50 | | - assumeTrue("Don't run on windows", distribution.platform != Distribution.Platform.WINDOWS); |
51 | 47 | installation = installArchive(sh, distribution()); |
52 | 48 | // Enable security for these tests only where it is necessary, until we can enable it for all |
53 | | - // TODO: Remove this when https://github.com/elastic/elasticsearch/pull/77231 is merged |
54 | 49 | ServerUtils.enableSecurityFeatures(installation); |
55 | 50 | verifyArchiveInstallation(installation, distribution()); |
56 | | - installation.executables().securityConfigTool.run(""); |
57 | 51 | } |
58 | 52 |
|
59 | 53 | public void test20NoAutoGenerationWhenAutoConfigurationDisabled() throws Exception { |
@@ -88,12 +82,7 @@ public void test40VerifyAutogeneratedCredentials() throws Exception { |
88 | 82 | assertThat(parseElasticPassword(result.stdout), notNullValue()); |
89 | 83 | assertThat(parseKibanaToken(result.stdout), notNullValue()); |
90 | 84 | assertThat(parseFingerprint(result.stdout), notNullValue()); |
91 | | - String response = ServerUtils.makeRequest( |
92 | | - Request.Get("https://localhost:9200"), |
93 | | - "elastic", |
94 | | - parseElasticPassword(result.stdout), |
95 | | - ServerUtils.getCaCert(installation.config) |
96 | | - ); |
| 85 | + String response = makeRequestAsElastic("https://localhost:9200", parseElasticPassword(result.stdout)); |
97 | 86 | assertThat(response, containsString("You Know, for Search")); |
98 | 87 | } |
99 | 88 |
|
|
0 commit comments