Commit graph

632 commits

Author SHA1 Message Date
Maximilian Seifert 1171b5c999 Merge branch 'master' into fix-database-errors-601 2019-10-30 21:51:51 +01:00
Andrew Morgan 145921f207
Pin golangci-lint version to non-broken one (#809) 2019-10-08 12:20:37 +01:00
Alex Chen e959927d0a selectAccountDataByType shouldn't error when no rows (#804)
Signed-off-by: Alex Chen <minecnly@gmail.com>
2019-10-07 13:15:58 +01:00
Andrew Morgan 9a56cf8439
Add AppService to test config and bind addrs (#800)
Because our unit tests are often forgotten about :/
2019-10-04 17:08:00 +01:00
aditsachde 7d77538ca4 patch dendrite microservices with bind config (#795)
This PR adds a block in the dendrite config for the services to bind to. The microservices should bind to the addresses in the bind block, and will be contacted at the address in the listen block.

This fixes an issue with the microservices and kubernetes services.
2019-10-02 10:29:27 +01:00
Alex Chen 3e2bb8bf2f
Clean up CircleCI leftovers (#801) 2019-10-02 11:01:52 +08:00
Maximilian Seifert ca588f30f6 Drop related tables prior to running tests 2019-10-01 22:17:01 +02:00
Alex Chen e239fb10f3
Add missing servers field in /directory/room/:alias response (#732) 2019-10-02 00:09:47 +08:00
Andrew Morgan ce09d7c498 lint 2019-10-01 11:24:59 +01:00
Behouba Manassé 49fd47c863 selectAccountDataByType return ClientEvent pointer instead of slice of ClientEvent (#798)
This pull request is an attempt to fix #773.

Signed-off-by: Kouame Behouba Manassé behouba@gmail.com
2019-09-30 17:25:04 +01:00
Andrew Morgan 6c104038c0 Merge branch 'master' of github.com:matrix-org/dendrite into fix-database-errors-601 2019-09-26 15:00:57 +01:00
Andrew Morgan 7b454bdd27
Remove CircleCI (#793)
Sytest has been switched to Buildkite. As such the `.circleci` folder has been removed.
2019-09-26 14:27:14 +01:00
Andrew Morgan e91942c9e4
Add 'Can paginate public room list' to testfile (#797) 2019-09-26 14:20:34 +01:00
Maximilian Seifert 8df64db353 Fix: DeviceID → SessionID 2019-09-25 21:33:11 +02:00
Maximilian Seifert a87effe020 Add *~ to gitignore 2019-09-25 20:54:40 +02:00
Maximilian Seifert fa3a6e2787 Merge branch 'master' into fix-database-errors-601 2019-09-25 20:54:03 +02:00
Maximilian Seifert f6ac51bad6 Fix broken local DB test
Committing transactions DOES help, who could have foreseen this.

Also: expose the PostgreSQL port 5432 to local 15432 via docker-compose
file. Please point me to a cleaner solution, as that port-mapping is clearly not
required except for testing.

Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-30 23:18:49 +02:00
Alex Chen 5e25f6ba22
Set up queryAPI in federationsender (#791) 2019-08-24 01:25:10 +08:00
Alex Chen 43308d2f3f
Associate transactions with session IDs instead of device IDs (#789) 2019-08-24 00:55:40 +08:00
Alex Chen 5eb63f1d1e
Add joined hosts query APIs (#781)
This adds two joined hosts query APIs to the federation sender for use of other components.
2019-08-22 19:47:52 +08:00
Maximilian Seifert e58a7c92e9 Add passing test to testfile 2019-08-20 20:47:40 +02:00
Maximilian Seifert 81126c21d9 Fix broken symbols due to rename
Also: rename SyncServerDatabase to SyncServerDatasource in comment in
syncserver.go
2019-08-20 20:46:50 +02:00
Maximilian Seifert 9f63d9f0c3 Return nil early on fail 2019-08-20 20:46:50 +02:00
Maximilian Seifert 5c8296236d Remove superfluous scripts and docker-compose-test
This MR should now comply with the current environment as Travis-CI is
no longer in use.

Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 050e44cfd0 Initially connect to postgres DB when creating dendrite DB
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert e53c293a70 go fmt && fix dataSources
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 7edf1a038a Use travis' postgres for testing
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 8b8b55d0a6 Correction of database connector string
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert db50a1d69e Run travis tests in monolith_test
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 80d3ad96b2 Alter test data to pass sanitation checks
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 812aec1829 Cleanup code according to lint
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 101f922ddc Select db connect string according to execution environment
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert b617eee4cb Add simple tests to validate bugfix (#601)
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 329900f644 Add docker-compose file for executing tests
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert ab8e687ca0 Add test cases for CreateDevice and GetDevicesByLocalpart
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 433526b010 Initially connect to postgres DB when creating dendrite DB
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert d52210c5b8 go fmt && fix dataSources
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 202b0fc7c6 Use travis' postgres for testing
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 02ab2fbbb6 Correction of database connector string
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 9abeca94bc Run travis tests in monolith_test
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 92af2a6b27 Alter test data to pass sanitation checks
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 9242997ae7 Cleanup code according to lint
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 4017ff2871 Select db connect string according to execution environment
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert c5f7000361 Add simple tests to validate bugfix (#601)
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 731eee377d Fix error in "rowsToStreamEvent"
Add columns device_id, transaction_id to select statement.
This matches the subsequent call to Scan() and thus prevents the error.

Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 6147c72663 Add docker-compose file for executing tests
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert c1f8890f8d Add test cases for CreateDevice and GetDevicesByLocalpart
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert 193933000d Fill DisplayName field in call to Scan()
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Maximilian Seifert c522976058 Add DisplayName field to device structure
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
2019-08-20 20:46:50 +02:00
Alex Chen a81917c3e7
Make trailing slash on server key request optional (#788)
Cherry-picked from 7e861b60fbd721b374ec929926b14e57dc60ec41
2019-08-20 01:01:53 +08:00