From 9bc6923a850638c160c066a9839c3964d303b575 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Sun, 18 Nov 2018 12:26:10 +0100 Subject: [PATCH] cmd/swarm: use global cluster --- cmd/swarm/access_test.go | 61 ++++++++++++++++++++++++---------------- cmd/swarm/export_test.go | 4 +-- cmd/swarm/upload_test.go | 50 ++++++++++++++++++-------------- 3 files changed, 67 insertions(+), 48 deletions(-) diff --git a/cmd/swarm/access_test.go b/cmd/swarm/access_test.go index e812cd8fd1..1c7a257dcb 100644 --- a/cmd/swarm/access_test.go +++ b/cmd/swarm/access_test.go @@ -37,8 +37,7 @@ import ( "github.com/ethereum/go-ethereum/crypto/sha3" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/swarm/api" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" + swarmapi "github.com/ethereum/go-ethereum/swarm/api/client" "github.com/ethereum/go-ethereum/swarm/testutil" ) @@ -49,22 +48,42 @@ const ( var DefaultCurve = crypto.S256() +var cluster *testCluster + +const clusterSize = 3 + +func TestACT(t *testing.T) { + cases := []struct { + name string + f func(t *testing.T) + }{ + {"PK", tTestAccessPK}, + {"ACT", tTestAccessACT}, + {"ACTScale", tTestAccessACTScale}, + {"Password", tTestAccessPassword}, + } + + cluster = newTestCluster(t, clusterSize) + defer cluster.Shutdown() + + for _, tc := range cases { + t.Run(tc.name, tc.f) + } +} + // TestAccessPassword tests for the correct creation of an ACT manifest protected by a password. // The test creates bogus content, uploads it encrypted, then creates the wrapping manifest with the Access entry // The parties participating - node (publisher), uploads to second node then disappears. Content which was uploaded // is then fetched through 2nd node. since the tested code is not key-aware - we can just // fetch from the 2nd node using HTTP BasicAuth -func TestAccessPassword(t *testing.T) { - srv := swarmhttp.NewTestSwarmServer(t, serverFunc, nil) - defer srv.Close() - +func tTestAccessPassword(t *testing.T) { dataFilename := testutil.TempFileWithContent(t, data) defer os.RemoveAll(dataFilename) // upload the file with 'swarm up' and expect a hash up := runSwarm(t, "--bzzapi", - srv.URL, //it doesn't matter through which node we upload content + cluster.Nodes[0].URL, "up", "--encrypt", dataFilename) @@ -138,16 +157,17 @@ func TestAccessPassword(t *testing.T) { if a.Publisher != "" { t.Fatal("should be empty") } - client := swarm.NewClient(srv.URL) + + client := swarmapi.NewClient(cluster.Nodes[0].URL) hash, err := client.UploadManifest(&m, false) if err != nil { t.Fatal(err) } - httpClient := &http.Client{} + url := cluster.Nodes[0].URL + "/" + "bzz:/" + hash - url := srv.URL + "/" + "bzz:/" + hash + httpClient := &http.Client{} response, err := httpClient.Get(url) if err != nil { t.Fatal(err) @@ -189,7 +209,7 @@ func TestAccessPassword(t *testing.T) { //download file with 'swarm down' with wrong password up = runSwarm(t, "--bzzapi", - srv.URL, + cluster.Nodes[0].URL, "down", "bzz:/"+hash, tmp, @@ -208,11 +228,7 @@ func TestAccessPassword(t *testing.T) { // The parties participating - node (publisher), uploads to second node (which is also the grantee) then disappears. // Content which was uploaded is then fetched through the grantee's http proxy. Since the tested code is private-key aware, // the test will fail if the proxy's given private key is not granted on the ACT. -func TestAccessPK(t *testing.T) { - // Setup Swarm and upload a test file to it - cluster := newTestCluster(t, 2) - defer cluster.Shutdown() - +func tTestAccessPK(t *testing.T) { dataFilename := testutil.TempFileWithContent(t, data) defer os.RemoveAll(dataFilename) @@ -318,7 +334,7 @@ func TestAccessPK(t *testing.T) { if a.Publisher != pkComp { t.Fatal("publisher key did not match") } - client := swarm.NewClient(cluster.Nodes[0].URL) + client := swarmapi.NewClient(cluster.Nodes[0].URL) hash, err := client.UploadManifest(&m, false) if err != nil { @@ -345,12 +361,12 @@ func TestAccessPK(t *testing.T) { } // TestAccessACT tests the creation of the ACT manifest end-to-end, without any bogus entries (i.e. default scenario = 3 nodes 1 unauthorized) -func TestAccessACT(t *testing.T) { +func tTestAccessACT(t *testing.T) { testAccessACT(t, 0) } // TestAccessACTScale tests the creation of the ACT manifest end-to-end, with 1000 bogus entries (i.e. 1000 EC keys + default scenario = 3 nodes 1 unauthorized = 1003 keys in the ACT manifest) -func TestAccessACTScale(t *testing.T) { +func tTestAccessACTScale(t *testing.T) { testAccessACT(t, 1000) } @@ -360,13 +376,8 @@ func TestAccessACTScale(t *testing.T) { // the third node then then tries to download using a correct password (and succeeds) then uses a wrong password and fails. // the publisher uploads through one of the nodes then disappears. func testAccessACT(t *testing.T, bogusEntries int) { - // Setup Swarm and upload a test file to it - const clusterSize = 3 - cluster := newTestCluster(t, clusterSize) - defer cluster.Shutdown() - var uploadThroughNode = cluster.Nodes[0] - client := swarm.NewClient(uploadThroughNode.URL) + client := swarmapi.NewClient(uploadThroughNode.URL) r1 := gorand.New(gorand.NewSource(time.Now().UnixNano())) nodeToSkip := r1.Intn(clusterSize) // a number between 0 and 2 (node indices in `cluster`) diff --git a/cmd/swarm/export_test.go b/cmd/swarm/export_test.go index f1bc2f2658..e8671eea79 100644 --- a/cmd/swarm/export_test.go +++ b/cmd/swarm/export_test.go @@ -43,8 +43,8 @@ func TestCLISwarmExportImport(t *testing.T) { } cluster := newTestCluster(t, 1) - // generate random 10mb file - content := testutil.RandomBytes(1, 10000000) + // generate random 1mb file + content := testutil.RandomBytes(1, 1000000) fileName := testutil.TempFileWithContent(t, string(content)) defer os.Remove(fileName) diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 5f9844950e..6f216a87ec 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -31,8 +31,7 @@ import ( "time" "github.com/ethereum/go-ethereum/log" - swarm "github.com/ethereum/go-ethereum/swarm/api/client" - swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http" + swarmapi "github.com/ethereum/go-ethereum/swarm/api/client" "github.com/ethereum/go-ethereum/swarm/testutil" "github.com/mattn/go-colorable" ) @@ -42,16 +41,36 @@ func init() { log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(*loglevel), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true)))) } +func TestCLI(t *testing.T) { + cases := []struct { + name string + f func(t *testing.T) + }{ + {"SwarmUp", tTestCLISwarmUp}, + {"SwarmUpEncrypted", tTestCLISwarmUpEncrypted}, + {"SwarmUpRecursive", tTestCLISwarmUpRecursive}, + {"SwarmUpEncryptedRecursive", tTestCLISwarmUpEncryptedRecursive}, + {"SwarmUpDefaultPath", tTestCLISwarmUpDefaultPath}, + } + + cluster = newTestCluster(t, clusterSize) + defer cluster.Shutdown() + + for _, tc := range cases { + t.Run(tc.name, tc.f) + } +} + // TestCLISwarmUp tests that running 'swarm up' makes the resulting file // available from all nodes via the HTTP API -func TestCLISwarmUp(t *testing.T) { +func tTestCLISwarmUp(t *testing.T) { if runtime.GOOS == "windows" { t.Skip() } testCLISwarmUp(false, t) } -func TestCLISwarmUpRecursive(t *testing.T) { +func tTestCLISwarmUpRecursive(t *testing.T) { if runtime.GOOS == "windows" { t.Skip() } @@ -60,13 +79,13 @@ func TestCLISwarmUpRecursive(t *testing.T) { // TestCLISwarmUpEncrypted tests that running 'swarm encrypted-up' makes the resulting file // available from all nodes via the HTTP API -func TestCLISwarmUpEncrypted(t *testing.T) { +func tTestCLISwarmUpEncrypted(t *testing.T) { if runtime.GOOS == "windows" { t.Skip() } testCLISwarmUp(true, t) } -func TestCLISwarmUpEncryptedRecursive(t *testing.T) { +func tTestCLISwarmUpEncryptedRecursive(t *testing.T) { if runtime.GOOS == "windows" { t.Skip() } @@ -74,10 +93,6 @@ func TestCLISwarmUpEncryptedRecursive(t *testing.T) { } func testCLISwarmUp(toEncrypt bool, t *testing.T) { - log.Info("starting 3 node cluster") - cluster := newTestCluster(t, 3) - defer cluster.Shutdown() - tmpFileName := testutil.TempFileWithContent(t, data) defer os.Remove(tmpFileName) @@ -183,10 +198,6 @@ func testCLISwarmUp(toEncrypt bool, t *testing.T) { } func testCLISwarmUpRecursive(toEncrypt bool, t *testing.T) { - fmt.Println("starting 3 node cluster") - cluster := newTestCluster(t, 3) - defer cluster.Shutdown() - tmpUploadDir, err := ioutil.TempDir("", "swarm-test") if err != nil { t.Fatal(err) @@ -253,7 +264,7 @@ func testCLISwarmUpRecursive(toEncrypt bool, t *testing.T) { switch mode := fi.Mode(); { case mode.IsRegular(): - if file, err := swarm.Open(path.Join(tmpDownload, v.Name())); err != nil { + if file, err := swarmapi.Open(path.Join(tmpDownload, v.Name())); err != nil { t.Fatalf("encountered an error opening the file returned from the CLI: %v", err) } else { ff := make([]byte, len(data)) @@ -276,7 +287,7 @@ func testCLISwarmUpRecursive(toEncrypt bool, t *testing.T) { // TestCLISwarmUpDefaultPath tests swarm recursive upload with relative and absolute // default paths and with encryption. -func TestCLISwarmUpDefaultPath(t *testing.T) { +func tTestCLISwarmUpDefaultPath(t *testing.T) { if runtime.GOOS == "windows" { t.Skip() } @@ -287,9 +298,6 @@ func TestCLISwarmUpDefaultPath(t *testing.T) { } func testCLISwarmUpDefaultPath(toEncrypt bool, absDefaultPath bool, t *testing.T) { - srv := swarmhttp.NewTestSwarmServer(t, serverFunc, nil) - defer srv.Close() - tmp, err := ioutil.TempDir("", "swarm-defaultpath-test") if err != nil { t.Fatal(err) @@ -312,7 +320,7 @@ func testCLISwarmUpDefaultPath(toEncrypt bool, absDefaultPath bool, t *testing.T args := []string{ "--bzzapi", - srv.URL, + cluster.Nodes[0].URL, "--recursive", "--defaultpath", defaultPath, @@ -329,7 +337,7 @@ func testCLISwarmUpDefaultPath(toEncrypt bool, absDefaultPath bool, t *testing.T up.ExpectExit() hash := matches[0] - client := swarm.NewClient(srv.URL) + client := swarmapi.NewClient(cluster.Nodes[0].URL) m, isEncrypted, err := client.DownloadManifest(hash) if err != nil {