jdb/strawboss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unit tests for latest changes to API.

Browse Source
This commit is contained in:
Jonathan Bernard 2017-12-01 09:45:10 -06:00
parent 2622877db5
commit ce7d4b60de
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/nim/strawbosspkg/server.nim
View File

@ -145,7 +145,6 @@ template checkAuth() =
debug "Auth failed: " & getCurrentExceptionMsg() debug "Auth failed: " & getCurrentExceptionMsg()
response.data[2]["WWW-Authenticate"] = "Bearer" response.data[2]["WWW-Authenticate"] = "Bearer"
response.buildJson(Http401) response.buildJson(Http401)
return
proc start*(cfg: StrawBossConfig): void = proc start*(cfg: StrawBossConfig): void =
@ -167,12 +166,12 @@ proc start*(cfg: StrawBossConfig): void =
let jsonBody = parseJson(request.body) let jsonBody = parseJson(request.body)
uname = jsonBody["username"].getStr uname = jsonBody["username"].getStr
pwd = jsonBody["password"].getStr pwd = jsonBody["password"].getStr
except: response.buildJson(Http400); return except: response.buildJson(Http400); return true
try: try:
let authToken = makeAuthToken(cfg, uname, pwd) let authToken = makeAuthToken(cfg, uname, pwd)
resp($(%authToken), JSON) resp($(%authToken), JSON)
except: response.buildJson(Http401, getCurrentExceptionMsg()); return except: response.buildJson(Http401, getCurrentExceptionMsg()); return true
get "/verify-auth": get "/verify-auth":
checkAuth(); if not authed: return true checkAuth(); if not authed: return true
@ -192,7 +191,7 @@ proc start*(cfg: StrawBossConfig): void =
checkAuth(); if not authed: return true checkAuth(); if not authed: return true
# TODO # TODO
response.buildJson(Http501); return response.buildJson(Http501); return true
get "/project/@projectName": get "/project/@projectName":
## Return a project's configuration, as well as it's versions. ## Return a project's configuration, as well as it's versions.
@ -443,7 +442,7 @@ proc start*(cfg: StrawBossConfig): void =
return true return true
post "/service/debug/stop": post "/service/debug/stop":
if not cfg.debug: response.buildJson(Http404); return if not cfg.debug: response.buildJson(Http404); return true
else: else:
let shutdownFut = sleepAsync(100) let shutdownFut = sleepAsync(100)
shutdownFut.callback = proc(): void = complete(stopFuture) shutdownFut.callback = proc(): void = complete(stopFuture)

6
src/test/nim/functional/tserver.nim
View File

@ -135,12 +135,12 @@ suite "strawboss server":
let completedRun = http.waitForBuild(apiBase, testProjName, $queuedRun.id) let completedRun = http.waitForBuild(apiBase, testProjName, $queuedRun.id)
# there should be successful status files for both the build and test steps # there should be successful status files for both the build and test steps
for stepName in ["build", "test"]: for step in [("build", BuildState.stepComplete), ("test", BuildState.complete)]:
let statusFile = tempBuildDataDir & "/" & testProjName & "/status/" & stepName & "/0.2.1.json" let statusFile = tempBuildDataDir & "/" & testProjName & "/status/" & step[0] & "/0.2.1.json"
check fileExists(statusFile) check fileExists(statusFile)
let status = loadBuildStatus(statusFile) let status = loadBuildStatus(statusFile)
check status.state == BuildState.complete check status.state == step[1]
#test "already completed steps should not be rebuilt": #test "already completed steps should not be rebuilt":
# let http = newAuthenticatedHttpClient(apibase, "bob@builder.com", "password") # let http = newAuthenticatedHttpClient(apibase, "bob@builder.com", "password")