Skip to content

Commit 37db18d

Browse files
Disable websudo in JsmH2Deployment and added test case (#21)
Co-authored-by: tobias <tobias.nilsson@eficode.com>
1 parent a7d78fe commit 37db18d

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.eficode</groupId>
88
<artifactId>devstack</artifactId>
9-
<version>2.3.0-SNAPSHOT</version>
9+
<version>2.3.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>DevStack</name>

src/main/groovy/com/eficode/devstack/deployment/impl/JsmH2Deployment.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ class JsmH2Deployment implements Deployment{
104104
assert jsmContainer.startContainer() : "Error starting JSM container:" + jsmContainer.id
105105
log.info("\tStarted JSM container")
106106

107-
107+
log.info("\tCreating jira-config.properties")
108+
String cmdJiraConfigProperties = "echo \"jira.websudo.is.disabled=true\" >> jira-config.properties; chown jira:jira jira-config.properties && echo status: \$?"
109+
assert jsmContainer.runBashCommandInContainer(cmdJiraConfigProperties).find {it == "status: 0"} : "Error creating jira-config.properties file"
108110

109111
log.info("\tSetting up local H2 database")
110112
assert jiraRest.setupH2Database() : "Error setting up H2 database for JSM"

src/test/groovy/com/eficode/devstack/deployment/impl/JsmH2DeploymentTest.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ class JsmH2DeploymentTest extends DevStackSpec {
4949
Unirest.get(baseurl).asEmpty().status == 200
5050
jsmDep.jsmContainer.inspectContainer().networkSettings.ports.find { it.key == "$port/tcp" }
5151

52+
//Make sure websudo was disabled
53+
jsmDep.jsmContainer.runBashCommandInContainer("cat jira-config.properties").find {it == "jira.websudo.is.disabled=true"}
54+
jsmDep.jsmContainer.containerLogs.find {it.matches(".*jira.websudo.is.disabled.*:.*true.*")}
55+
56+
5257

5358
where:
5459
baseurl | port | dockerHost | certPath

0 commit comments

Comments
 (0)