Merge branch 'buildbot' of dan/cwtch into master

This commit is contained in:
Sarah Jamie Lewis 2018-07-02 17:25:08 +00:00 committed by Gogs
commit e5bce02c7c
2 changed files with 7 additions and 4 deletions

View File

@ -8,6 +8,7 @@ pipeline:
commands: commands:
- wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/bin/tor - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/bin/tor
- wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/torrc - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/torrc
- wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/gogs-notify.sh
- chmod a+x tor - chmod a+x tor
- go list ./... | xargs go get - go list ./... | xargs go get
- go get -u github.com/golang/lint/golint - go get -u github.com/golang/lint/golint
@ -25,7 +26,7 @@ pipeline:
image: golang image: golang
commands: commands:
- ./tor -f ./torrc - ./tor -f ./torrc
- sleep 10 - sleep 15
- go test -v cwtch.im/cwtch/testing - go test -v cwtch.im/cwtch/testing
notify-email: notify-email:
image: drillster/drone-email image: drillster/drone-email
@ -37,7 +38,9 @@ pipeline:
status: [ success, changed, failure ] status: [ success, changed, failure ]
notify-gogs: notify-gogs:
image: golang image: golang
secrets: [buildbot] when:
event: pull-request
secrets: [BUILDBOT]
commands: commands:
- echo "Notifying" - echo "Notifying"
- curl -H "Authorization:token $BUILDBOT" https://git.openprivacy.ca/api/v1/repos/cwtch.im/cwtch - sh gogs-notify.sh

View File

@ -158,7 +158,7 @@ func TestCwtchPeerIntegration(t *testing.T) {
fmt.Println("Carol created:", carol.GetProfile().Onion) fmt.Println("Carol created:", carol.GetProfile().Onion)
fmt.Println("Waiting for Alice, Bob, and Carol to connection with onion network...") fmt.Println("Waiting for Alice, Bob, and Carol to connection with onion network...")
time.Sleep(time.Second * 70) time.Sleep(time.Second * 90)
numGoRoutinesPostPeerStart := runtime.NumGoroutine() numGoRoutinesPostPeerStart := runtime.NumGoroutine()
// ***** Peering, server joining, group creation / invite ***** // ***** Peering, server joining, group creation / invite *****