Browse Source

Merge branch 'buildbot' of dan/cwtch into master

pull/88/head
Sarah Jamie Lewis Gogs 1 year ago
parent
commit
e5bce02c7c
2 changed files with 7 additions and 4 deletions
  1. +6
    -3
      .drone.yml
  2. +1
    -1
      testing/cwtch_peer_server_intergration_test.go

+ 6
- 3
.drone.yml View File

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

+ 1
- 1
testing/cwtch_peer_server_intergration_test.go View File

@@ -158,7 +158,7 @@ func TestCwtchPeerIntegration(t *testing.T) {
fmt.Println("Carol created:", carol.GetProfile().Onion)

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()

// ***** Peering, server joining, group creation / invite *****


Loading…
Cancel
Save