diff options
author | Janos Guljas <janos@resenje.org> | 2017-12-14 17:35:49 +0800 |
---|---|---|
committer | Janos Guljas <janos@resenje.org> | 2017-12-14 17:36:12 +0800 |
commit | 47a801455966298d1d1519eebb955024c8f02b84 (patch) | |
tree | 5b8144ba4844092dc0bae599fc3314eaacf1a7b4 /cmd/swarm/config_test.go | |
parent | 19982f946735948478b6b7e7706f1b615f171d0d (diff) | |
parent | 3654aeaa4f87452ac5bc801a18808189595e2ef8 (diff) | |
download | go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.gz go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.bz2 go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.lz go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.xz go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.tar.zst go-tangerine-47a801455966298d1d1519eebb955024c8f02b84.zip |
cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Fix a conflict in cmd/swarm envVarsOverride function.
Diffstat (limited to 'cmd/swarm/config_test.go')
-rw-r--r-- | cmd/swarm/config_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/swarm/config_test.go b/cmd/swarm/config_test.go index 7ffe2cfb9..166980d14 100644 --- a/cmd/swarm/config_test.go +++ b/cmd/swarm/config_test.go @@ -124,7 +124,7 @@ func TestCmdLineOverrides(t *testing.T) { t.Fatalf("Expected network ID to be %d, got %d", 42, info.NetworkId) } - if info.SyncEnabled != true { + if !info.SyncEnabled { t.Fatal("Expected Sync to be enabled, but is false") } @@ -219,7 +219,7 @@ func TestFileOverrides(t *testing.T) { t.Fatalf("Expected network ID to be %d, got %d", 54, info.NetworkId) } - if info.SyncEnabled != true { + if !info.SyncEnabled { t.Fatal("Expected Sync to be enabled, but is false") } @@ -334,7 +334,7 @@ func TestEnvVars(t *testing.T) { t.Fatalf("Expected Cors flag to be set to %s, got %s", "*", info.Cors) } - if info.SyncEnabled != true { + if !info.SyncEnabled { t.Fatal("Expected Sync to be enabled, but is false") } @@ -431,7 +431,7 @@ func TestCmdLineOverridesFile(t *testing.T) { t.Fatalf("Expected network ID to be %d, got %d", expectNetworkId, info.NetworkId) } - if info.SyncEnabled != true { + if !info.SyncEnabled { t.Fatal("Expected Sync to be enabled, but is false") } |