From c4a399cf8caf86282d88f39275bcf4e7f02a2ab9 Mon Sep 17 00:00:00 2001
From: Javier Peletier <jm@epiclabs.io>
Date: Fri, 28 Sep 2018 11:29:36 +0200
Subject: [PATCH] cmd/swarm: Speeded up TestCLIResourceUpdate

---
 cmd/swarm/mru_test.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/cmd/swarm/mru_test.go b/cmd/swarm/mru_test.go
index f7888b5f4f..142cf9cfd6 100644
--- a/cmd/swarm/mru_test.go
+++ b/cmd/swarm/mru_test.go
@@ -25,7 +25,9 @@ import (
 	"os"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/swarm/api"
 	"github.com/ethereum/go-ethereum/swarm/storage/mru/lookup"
+	"github.com/ethereum/go-ethereum/swarm/testutil"
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/swarm/storage/mru"
@@ -33,12 +35,16 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/log"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
+	swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http"
 )
 
 func TestCLIResourceUpdate(t *testing.T) {
+
+	srv := testutil.NewTestSwarmServer(t, func(api *api.API) testutil.TestServer {
+		return swarmhttp.NewServer(api, "")
+	}, nil)
 	log.Info("starting 1 node cluster")
-	cluster := newTestCluster(t, 1)
-	defer cluster.Shutdown()
+	defer srv.Close()
 
 	// create a private key file for signing
 	pkfile, err := ioutil.TempFile("", "swarm-test")
@@ -69,7 +75,7 @@ func TestCLIResourceUpdate(t *testing.T) {
 	hexData := hexutil.Encode(data)
 
 	flags := []string{
-		"--bzzapi", cluster.Nodes[0].URL,
+		"--bzzapi", srv.URL,
 		"--bzzaccount", pkfile.Name(),
 		"resource", "update",
 		"--topic", topic.Hex(),
@@ -82,7 +88,7 @@ func TestCLIResourceUpdate(t *testing.T) {
 	cmd.ExpectExit()
 
 	// now try to get the update using the client
-	client := swarm.NewClient(cluster.Nodes[0].URL)
+	client := swarm.NewClient(srv.URL)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -121,7 +127,7 @@ func TestCLIResourceUpdate(t *testing.T) {
 
 	// Now retrieve info for the next update
 	flags = []string{
-		"--bzzapi", cluster.Nodes[0].URL,
+		"--bzzapi", srv.URL,
 		"resource", "info",
 		"--topic", topic.Hex(),
 		"--user", address.Hex(),
@@ -146,7 +152,7 @@ func TestCLIResourceUpdate(t *testing.T) {
 
 	// test publishing a manifest
 	flags = []string{
-		"--bzzapi", cluster.Nodes[0].URL,
+		"--bzzapi", srv.URL,
 		"--bzzaccount", pkfile.Name(),
 		"resource", "create",
 		"--topic", topic.Hex(),