fix(ci): e2e test with p2p network

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Mar 8, 2019 · a0f2b93 · a0f2b93
1 parent 8aaab09
commit a0f2b93
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/core/network/host/routing.go b/core/network/host/routing.go
@@ -9,7 +9,6 @@ import (
 	cid "github.com/ipfs/go-cid"
 	datastore "github.com/ipfs/go-datastore"
 	syncdatastore "github.com/ipfs/go-datastore/sync"
-	log "github.com/ipfs/go-log"
 	host "github.com/libp2p/go-libp2p-host"
 	kaddht "github.com/libp2p/go-libp2p-kad-dht"
 	inet "github.com/libp2p/go-libp2p-net"
@@ -39,7 +38,7 @@ type BertyRouting struct {
 }
 
 func init() {
-	log.SetDebugLogging()
+	// log.SetDebugLogging()
 }
 
 func NewBertyRouting(ctx context.Context, h host.Host, dhtSvc bool) (*BertyRouting, error) {

diff --git a/core/test/e2e_test.go b/core/test/e2e_test.go
@@ -826,7 +826,11 @@ func TestAliasesFlow(t *testing.T) {
 }
 
 func setupP2PNetwork(ctx context.Context) (*p2pnet.Network, error) {
-	return p2pnet.New(ctx, p2pnet.WithDefaultOptions(), p2pnet.DisableDefaultBootstrap())
+	return p2pnet.New(ctx,
+		p2pnet.WithDefaultOptions(),
+		p2pnet.DisableDHT(),
+		p2pnet.DisableHOP(),
+	)
 }
 
 func getBootstrap(ctx context.Context, n *p2pnet.Network) []string {

diff --git a/core/test/scenario_test.go b/core/test/scenario_test.go
@@ -79,7 +79,7 @@ func scenario(t *testing.T, alice, bob, eve *AppMock) {
 		})
 		Convey("Alice has Bob as friend", FailureHalts, func() {
 			shouldIContinue(t)
-			time.Sleep(200 * time.Millisecond)
+			time.Sleep(500 * time.Millisecond)
 
 			contacts, err := alice.client.ContactList(internalCtx, &node.ContactListInput{
 				Filter: &entity.Contact{Status: entity.Contact_IsFriend},
@@ -264,6 +264,7 @@ func scenario(t *testing.T, alice, bob, eve *AppMock) {
 		Convey("Bob has one message in conversation history", FailureHalts, func() {
 			shouldIContinue(t)
 
+			time.Sleep(4 * time.Second)
 			So(cache["conversation_id"], ShouldNotBeNil)
 			events, err := bob.client.EventList(internalCtx, &node.EventListInput{
 				Filter: &entity.Event{