Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-29 08:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

GitlabCI fix some tests

Browse source
This commit is contained in:
Gioacchino Mazzurco 2020-04-07 23:05:40 +02:00
parent a95b99dcb4
commit 8303f42af0
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -31,19 +31,15 @@ build-and-test:
retroshare-service --jsonApiPort 9092 retroshare-service --jsonApiPort 9092
- > - >
docker exec retroshare docker exec retroshare
curl --verbose http://127.0.0.1:9092/jsonApiServer/version | jq curl --verbose http://127.0.0.1:9092/rsJsonApi/version | jq
- >
docker exec retroshare
curl --verbose http://127.0.0.1:9092/rsMsgs/getChatLobbyList | jq
- > - >
docker exec retroshare docker exec retroshare
curl --verbose http://127.0.0.1:9092/rsLoginHelper/getLocations | jq curl --verbose http://127.0.0.1:9092/rsLoginHelper/getLocations | jq
- > - >
docker exec retroshare docker exec retroshare
curl --verbose --data curl --verbose --data
'{ "location":{ "mLocationName":"Test 1", "mPpgName":"Test2", '{ "location":{ "mLocationName":"Test 1", "mPpgName":"Test2" },
"makeHidden":false, "makeAutoTor":false }, "password":"Test 3", "password":"Test 3", "caller_data":"Test 5" }'
"caller_data":"Test 5" }'
http://127.0.0.1:9092/rsLoginHelper/createLocation | jq http://127.0.0.1:9092/rsLoginHelper/createLocation | jq
- > - >
docker exec retroshare docker exec retroshare

3
libretroshare/src/retroshare/rsinit.h
View file

@ -313,7 +313,8 @@ extern RsAccounts* rsAccounts;
class RsLoginHelper class RsLoginHelper
{ {
public: public:
RsLoginHelper() {} RsLoginHelper() = default;
/** /**
* @brief Normal way to attempt login * @brief Normal way to attempt login
* @jsonapi{development,manualwrapper} * @jsonapi{development,manualwrapper}