Skip to content

Commit

Permalink
[NOJIRA]
Browse files Browse the repository at this point in the history
update integration test build
  • Loading branch information
jj committed Mar 12, 2019
1 parent ce3d644 commit ea0b12e
Showing 1 changed file with 2 additions and 24 deletions.
26 changes: 2 additions & 24 deletions backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ sourceSets {
}
resources {
srcDir 'src/integration/resources'
srcDir new File(buildDir, 'generated/ui')
}
}
}
Expand All @@ -208,8 +209,7 @@ task copyUI(type: Copy) {
task integrationTest(type: Test) {
group = 'verification'
description = 'Run various integration tests'
dependsOn 'dockerRun', 'runChecker'
finalizedBy 'dockerStop'
dependsOn 'copyUI'
testClassesDirs = sourceSets.integrationTest.output.classesDirs
classpath = sourceSets.integrationTest.runtimeClasspath
systemProperties = System.properties
Expand Down Expand Up @@ -309,28 +309,6 @@ docker {
buildArgs(['JAR_FILE': "shibui-${version}.jar"])
}

tasks.dockerRun.dependsOn tasks.docker
dockerRun {
name 'shibuiint'
image 'unicon/shibui'
ports '10101:8080'
daemonize true
command '--spring.profiles.include=very-dangerous,dev'
clean true
}

task runChecker << {
def ready = false
while (!ready) {
try {
ready = 'http://localhost:10101'.toURL().text.length() > 0
} catch (IOException e) {
println 'cannot reach site'
sleep 5000
}
}
}

/*
* Docker Compose (gradle-docker-compose-plugin) settings.
* Used to start and stop docker containers before running tests.
Expand Down

0 comments on commit ea0b12e

Please sign in to comment.