github/trojan-go
4
0
Fork 0
mirror of https://github.com/p4gefau1t/trojan-go.git synced 2024-04-21 12:21:34 +00:00
Code Issues Releases Wiki Activity

fix api server test, dockerfile

Browse Source
This commit is contained in:
Page Fault
2020-07-14 17:05:10 +00:00
parent 63676f4927
commit c010e7dda1
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+3 -3
View File
@@ -4,12 +4,12 @@ RUN apk add git make &&\
git clone https://github.com/p4gefau1t/trojan-go.git &&\
cd trojan-go &&\
make &&\
wget https://github.com/v2ray/domain-list-community/raw/release/dlc.dat -O bin/geosite.dat &&\
wget https://github.com/v2ray/geoip/raw/release/geoip.dat -O bin/geoip.dat
wget https://github.com/v2ray/domain-list-community/raw/release/dlc.dat -O build/geosite.dat &&\
wget https://github.com/v2ray/geoip/raw/release/geoip.dat -O build/geoip.dat
FROM alpine
WORKDIR /
COPY --from=builder /trojan-go/bin /usr/local/bin/
COPY --from=builder /trojan-go/build /usr/local/bin/
COPY --from=builder /trojan-go/example/server.json /etc/trojan-go/config.json
ENTRYPOINT ["/usr/local/bin/trojan-go", "-config"]
api/service/server_test.go
+1 -4
View File
@@ -55,7 +55,7 @@ func TestServerAPI(t *testing.T) {
}
stream1.CloseSend()
user.AddTraffic(1234, 5678)
time.Sleep(time.Millisecond * 1000)
time.Sleep(time.Second * 1)
stream2, err := server.GetUsers(ctx)
common.Must(err)
stream2.Send(&GetUsersRequest{
@@ -68,9 +68,6 @@ func TestServerAPI(t *testing.T) {
if resp2.Status.TrafficTotal.DownloadTraffic != 1234 || resp2.Status.TrafficTotal.UploadTraffic != 5678 {
t.Fatal("wrong traffic")
}
if resp2.Status.SpeedCurrent.DownloadSpeed != 1234 || resp2.Status.TrafficTotal.UploadTraffic != 5678 {
t.Fatal("wrong speed")
}
stream3, err := server.SetUsers(ctx)
stream3.Send(&SetUsersRequest{