From 0fe9a372b3ff9fd0746c3e271bd0ddddd3412122 Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Tue, 9 Oct 2018 11:45:42 +0200
Subject: [PATCH] swarm, swarm/storage: lower constants for faster tests
(#17876)
* swarm/storage: lower constants for faster tests
* swarm: reduce test size for TestLocalStoreAndRetrieve
* swarm: reduce nodes for dec_inc_node_count
---
swarm/network_test.go | 6 +++---
swarm/storage/chunker_test.go | 3 ++-
swarm/storage/filestore_test.go | 2 +-
swarm/storage/ldbstore_test.go | 16 ++++++++--------
swarm/storage/memstore_test.go | 8 ++------
swarm/swarm_test.go | 4 ++--
6 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/swarm/network_test.go b/swarm/network_test.go
index 0b57fab33..aab1c0509 100644
--- a/swarm/network_test.go
+++ b/swarm/network_test.go
@@ -151,13 +151,13 @@ func TestSwarmNetwork(t *testing.T) {
name: "dec_inc_node_count",
steps: []testSwarmNetworkStep{
{
- nodeCount: 5,
+ nodeCount: 3,
},
{
- nodeCount: 3,
+ nodeCount: 1,
},
{
- nodeCount: 10,
+ nodeCount: 5,
},
},
options: &testSwarmNetworkOptions{
diff --git a/swarm/storage/chunker_test.go b/swarm/storage/chunker_test.go
index db719ca04..6172d8a09 100644
--- a/swarm/storage/chunker_test.go
+++ b/swarm/storage/chunker_test.go
@@ -232,7 +232,8 @@ func TestDataAppend(t *testing.T) {
func TestRandomData(t *testing.T) {
// This test can validate files up to a relatively short length, as tree chunker slows down drastically.
// Validation of longer files is done by TestLocalStoreAndRetrieve in swarm package.
- sizes := []int{1, 60, 83, 179, 253, 1024, 4095, 4096, 4097, 8191, 8192, 8193, 12287, 12288, 12289, 524288, 524288 + 1, 524288 + 4097, 7 * 524288, 7*524288 + 1, 7*524288 + 4097}
+ //sizes := []int{1, 60, 83, 179, 253, 1024, 4095, 4096, 4097, 8191, 8192, 8193, 12287, 12288, 12289, 524288, 524288 + 1, 524288 + 4097, 7 * 524288, 7*524288 + 1, 7*524288 + 4097}
+ sizes := []int{1, 60, 83, 179, 253, 1024, 4095, 4097, 8191, 8192, 12288, 12289, 524288}
tester := &chunkerTester{t: t}
for _, s := range sizes {
diff --git a/swarm/storage/filestore_test.go b/swarm/storage/filestore_test.go
index d79efb530..9fe58f60c 100644
--- a/swarm/storage/filestore_test.go
+++ b/swarm/storage/filestore_test.go
@@ -25,7 +25,7 @@ import (
"testing"
)
-const testDataSize = 0x1000000
+const testDataSize = 0x0001000
func TestFileStorerandom(t *testing.T) {
testFileStoreRandom(false, t)
diff --git a/swarm/storage/ldbstore_test.go b/swarm/storage/ldbstore_test.go
index 75b5d6aa9..14a42b5e3 100644
--- a/swarm/storage/ldbstore_test.go
+++ b/swarm/storage/ldbstore_test.go
@@ -111,12 +111,12 @@ func TestDbStoreCorrect_1(t *testing.T) {
testDbStoreCorrect(1, 4096, false, t)
}
-func TestDbStoreRandom_5k(t *testing.T) {
- testDbStoreRandom(5000, 0, false, t)
+func TestDbStoreRandom_1k(t *testing.T) {
+ testDbStoreRandom(1000, 0, false, t)
}
-func TestDbStoreCorrect_5k(t *testing.T) {
- testDbStoreCorrect(5000, 4096, false, t)
+func TestDbStoreCorrect_1k(t *testing.T) {
+ testDbStoreCorrect(1000, 4096, false, t)
}
func TestMockDbStoreRandom_1(t *testing.T) {
@@ -127,12 +127,12 @@ func TestMockDbStoreCorrect_1(t *testing.T) {
testDbStoreCorrect(1, 4096, true, t)
}
-func TestMockDbStoreRandom_5k(t *testing.T) {
- testDbStoreRandom(5000, 0, true, t)
+func TestMockDbStoreRandom_1k(t *testing.T) {
+ testDbStoreRandom(1000, 0, true, t)
}
-func TestMockDbStoreCorrect_5k(t *testing.T) {
- testDbStoreCorrect(5000, 4096, true, t)
+func TestMockDbStoreCorrect_1k(t *testing.T) {
+ testDbStoreCorrect(1000, 4096, true, t)
}
func testDbStoreNotFound(t *testing.T, mock bool) {
diff --git a/swarm/storage/memstore_test.go b/swarm/storage/memstore_test.go
index 6b370d2b4..6850d2d69 100644
--- a/swarm/storage/memstore_test.go
+++ b/swarm/storage/memstore_test.go
@@ -111,7 +111,7 @@ func TestMemStoreAndLDBStore(t *testing.T) {
chunkSize: 4096,
},
{
- n: 201,
+ n: 101,
chunkSize: 4096,
},
{
@@ -119,11 +119,7 @@ func TestMemStoreAndLDBStore(t *testing.T) {
chunkSize: 4096,
},
{
- n: 3100,
- chunkSize: 4096,
- },
- {
- n: 100,
+ n: 1100,
chunkSize: 4096,
},
}
diff --git a/swarm/swarm_test.go b/swarm/swarm_test.go
index c6569e37b..d85eb9118 100644
--- a/swarm/swarm_test.go
+++ b/swarm/swarm_test.go
@@ -316,11 +316,11 @@ func TestLocalStoreAndRetrieve(t *testing.T) {
}
// by default, test only the lonely chunk cases
- sizes := []int{1, 60, 4097, 524288 + 1, 7*524288 + 1, 128*524288 + 1}
+ sizes := []int{1, 60, 4097, 524288 + 1, 7*524288 + 1}
if *longrunning {
// test broader set of cases if -longruning flag is set
- sizes = append(sizes, 83, 179, 253, 1024, 4095, 4096, 8191, 8192, 8193, 12287, 12288, 12289, 123456, 2345678, 67298391, 524288, 524288+4096, 524288+4097, 7*524288, 7*524288+4096, 7*524288+4097, 128*524288, 128*524288+4096, 128*524288+4097, 816778334)
+ sizes = append(sizes, 83, 179, 253, 1024, 4095, 4096, 8191, 8192, 8193, 12287, 12288, 12289, 123456, 2345678, 67298391, 524288, 524288+4096, 524288+4097, 7*524288, 7*524288+4096, 7*524288+4097, 128*524288+1, 128*524288, 128*524288+4096, 128*524288+4097, 816778334)
}
for _, n := range sizes {
testLocalStoreAndRetrieve(t, swarm, n, true)
--
GitLab