mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/element-hq/dendrite.git synced 2025-09-15 13:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bump gomatrixserverlib (#353)

Browse source 
* Bump gomatrixserverlib

Mostly because I want to use Erik's go-faster jsoning.

* Update KeyDB for new KeyFetcher API

we now need to implement FetcherName.

* Attempt to fix integ tests

CanonicalJSON doesn't like the empty string, apparently, and anyway
canonicalising it is pointless.

* More integ test fix
This commit is contained in:
Richard van der Hoff 2017-11-27 12:05:14 +00:00 • committed by GitHub
parent 9e352e7311
commit 0786318a04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 7126 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests/main.go
View file

@ -239,7 +239,7 @@ func testDownload(host, origin, mediaID string, wantedStatusCode int, serverCmdC
testReq := &test.Request{
Req: req,
WantedStatusCode: wantedStatusCode,
WantedBody: test.CanonicalJSONInput([]string{""})[0],
WantedBody: "",
}
testReq.Run(fmt.Sprintf("download mxc://%v/%v from %v", origin, mediaID, host), timeout, serverCmdChan)
}
@ -263,7 +263,7 @@ func testThumbnail(width, height int, resizeMethod, host string, serverCmdChan c
testReq := &test.Request{
Req: req,
WantedStatusCode: 200,
WantedBody: test.CanonicalJSONInput([]string{""})[0],
WantedBody: "",
}
testReq.Run(fmt.Sprintf("thumbnail mxc://%v/%v%v from %v", testOrigin, testMediaID, query, host), timeout, serverCmdChan)
}