Skip to content

Commit 8ed217e

Browse files
authored
Merge pull request #54 from EMResearch/catwatch-fetch
Catwatch fetch
2 parents 90de782 + 297fead commit 8ed217e

4 files changed

Lines changed: 5 additions & 7 deletions

File tree

jdk_11_maven/em/embedded/rest/cwa-verification/src/main/java/em/embedded/app/coronawarn/verification/EmbeddedEvoMasterController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public String startSut() {
6262
"--spring.profiles.active=local,external,internal",
6363
"--management.server.port=-1",
6464
"--server.ssl.enabled=false",
65-
"--spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;"
65+
"--spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;",
66+
"--cwa-testresult-server=http://cwa-testresult-server:8088"
6667
});
6768

6869
if (sqlConnection != null) {

jdk_11_maven/em/external/rest/cwa-verification/src/main/java/em/external/app/coronawarn/verification/ExternalEvoMasterController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public String[] getInputParameters() {
9696
"--spring.profiles.active=local,external,internal",
9797
"--management.server.port=-1",
9898
"--server.ssl.enabled=false",
99+
"--cwa-testresult-server=http://cwa-testresult-server:8088"
99100
};
100101
}
101102

jdk_8_maven/em/embedded/rest/catwatch/src/main/java/em/embedded/org/zalando/EmbeddedEvoMasterController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ public void resetStateOfSUT() {
114114
public ProblemInfo getProblemInfo() {
115115
return new RestProblem(
116116
"http://localhost:" + getSutPort() + "/v2/api-docs",
117-
//TODO /fetch relies on accessing Github, and it is veryyyy slow.
118-
// Need to handle WireMock
119-
Arrays.asList("/fetch", "/health", "/health.json", "/error")
117+
Arrays.asList("/health", "/health.json", "/error")
120118
);
121119
}
122120

jdk_8_maven/em/external/rest/catwatch/src/main/java/em/external/org/zalando/ExternalEvoMasterController.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,7 @@ public String getPackagePrefixesToCover() {
191191
public ProblemInfo getProblemInfo() {
192192
return new RestProblem(
193193
getBaseURL() + "/v2/api-docs",
194-
//TODO /fetch relies on accessing Github, and it is veryyyy slow.
195-
// Need to handle WireMock
196-
Arrays.asList("/fetch", "/health", "/health.json", "/error")
194+
Arrays.asList("/health", "/health.json", "/error")
197195
);
198196
}
199197

0 commit comments

Comments
 (0)