Fork: 0
ONS / pmd-jenkins-library
Browse code
Write lock URI needs to have prepended.
add_tests master
1 parent f7975dc commit 540ba45d5aa50426e9e1d3f7a1ec0411ddc164d4
@Alex Tucker Alex Tucker authored on 25 Jan 2019
Patch
Unified Split
Showing 3 changed files
View
2
■■■■■
 src/uk/org/floop/jenkins_pmd/Drafter.groovy
int holdOffTime = 5
while(waiting) {
sleep(holdOffTime * 1000)
HttpResponse response = getExec().execute(
Request.Get(apiBase.resolve('/status/writes-locked'))
Request.Get(apiBase.resolve('/v1/status/writes-locked'))
.addHeader('Accept', 'application/json')
.userAgent(PMDConfig.UA)
).returnResponse()
if (response.getStatusLine().statusCode == 200) {
View
6
■■■■■
 test/integration/groovy/uk/org/floop/jenkins_pmd/DrafterTests.groovy
.inScenario("Write lock")
.withHeader('Accept', equalTo('application/json'))
.withBasicAuth('admin', 'admin')
.willReturn(aResponse().withStatus(202).withBodyFile('cubeImportJob.json')))
instanceRule.stubFor(get('/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c')
instanceRule.stubFor(get('/v1/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c')
.withHeader('Accept', equalTo('application/json'))
.withBasicAuth('admin', 'admin')
.willReturn(ok().withBodyFile('finishedImportJobOk.json')))
instanceRule.stubFor(get('/status/writes-locked')
instanceRule.stubFor(get('/v1/status/writes-locked')
.inScenario("Write lock")
.whenScenarioStateIs(Scenario.STARTED)
.withHeader('Accept', equalTo('application/json'))
.withBasicAuth('admin', 'admin')
.willReturn(ok().withBody('false'))
.willSetStateTo('Still Publishing'))
instanceRule.stubFor(get('/status/writes-locked')
instanceRule.stubFor(get('/v1/status/writes-locked')
.inScenario("Write lock")
.whenScenarioStateIs('Still publishing')
.withHeader('Accept', equalTo('application/json'))
.withBasicAuth('admin', 'admin')
View
2
■■■■■
 test/resources/__files/cubeImportJob.json
{"type":"ok","finished-job":"/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c","restart-id":"a2a8f11d-96fd-466e-adaf-85e8d07d4956"}
{"type":"ok","finished-job":"/v1/status/finished-jobs/4fc9ad42-f964-4f56-a1ab-a00bd622b84c","restart-id":"a2a8f11d-96fd-466e-adaf-85e8d07d4956"}