Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplifying Failover and RoundRobin tests #535

Merged
merged 1 commit into from
Jun 24, 2021
Merged

simplifying Failover and RoundRobin tests #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 10 additions & 19 deletions terratest/test/k8gb_full_failover_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"k8gbterratest/utils"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

Expand All @@ -47,49 +46,41 @@ func TestFullFailover(t *testing.T) {
instance2LocalTargets := instance2.GetLocalTargets()

t.Run("failover on two concurrent clusters with podinfo running", func(t *testing.T) {
_, err = instance1.WaitForExpected(instance1LocalTargets)
err = instance1.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
_, err = instance2.WaitForExpected(instance1LocalTargets)
err = instance2.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
})

t.Run("kill podinfo on the second cluster", func(t *testing.T) {
instance2.StopTestApp()
ip1, err := instance2.WaitForGSLB(instance1)
err = instance2.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
ip2, err := instance1.WaitForGSLB(instance2)
err = instance1.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
require.True(t, utils.EqualStringSlices(instance1LocalTargets, ip1))
require.True(t, utils.EqualStringSlices(instance1LocalTargets, ip2))
})

t.Run("kill podinfo on the first cluster", func(t *testing.T) {
instance1.StopTestApp()
ip2, err := instance1.WaitForGSLB(instance2)
err = instance1.WaitForExpected([]string{})
require.NoError(t, err)
ip1, err := instance2.WaitForGSLB(instance1)
err = instance2.WaitForExpected([]string{})
require.NoError(t, err)
assert.Nil(t, ip1)
assert.Nil(t, ip2)
})

t.Run("start podinfo on the second cluster", func(t *testing.T) {
instance2.StartTestApp()
ip2, err := instance2.WaitForGSLB(instance1)
err = instance2.WaitForExpected(instance2LocalTargets)
require.NoError(t, err)
ip1, err := instance1.WaitForGSLB(instance2)
err = instance1.WaitForExpected(instance2LocalTargets)
require.NoError(t, err)
require.True(t, utils.EqualStringSlices(ip1, instance2LocalTargets))
require.True(t, utils.EqualStringSlices(ip2, instance2LocalTargets))
})

t.Run("start podinfo on the first cluster", func(t *testing.T) {
instance1.StartTestApp()
ip1, err := instance1.WaitForGSLB()
err = instance1.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
ip2, err := instance1.WaitForExpected(ip1)
err = instance2.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
require.True(t, utils.EqualStringSlices(ip1, instance1LocalTargets))
require.True(t, utils.EqualStringSlices(ip2, instance1LocalTargets))
})
}
26 changes: 10 additions & 16 deletions terratest/test/k8gb_full_roundrobin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,48 +47,42 @@ func TestFullRoundRobin(t *testing.T) {
expectedIPs := append(instance1LocalTargets, instance2LocalTargets...)

t.Run("round-robin on two concurrent clusters with podinfo running", func(t *testing.T) {
_, err = instance1.WaitForExpected(expectedIPs)
err = instance1.WaitForExpected(expectedIPs)
require.NoError(t, err)
_, err = instance2.WaitForExpected(expectedIPs)
err = instance2.WaitForExpected(expectedIPs)
require.NoError(t, err)
})

t.Run("kill podinfo on the second cluster", func(t *testing.T) {
instance2.StopTestApp()
ip1, err := instance1.WaitForGSLB(instance2)
err = instance1.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
ip2, err := instance2.WaitForGSLB(instance1)
err = instance2.WaitForExpected(instance1LocalTargets)
require.NoError(t, err)
require.True(t, utils.EqualStringSlices(instance1LocalTargets, ip1))
require.True(t, utils.EqualStringSlices(instance1LocalTargets, ip2))
})

t.Run("kill podinfo on the first cluster", func(t *testing.T) {
instance1.StopTestApp()
ip2, err := instance2.WaitForGSLB(instance1)
err = instance2.WaitForExpected([]string{})
require.NoError(t, err)
ip1, err := instance1.WaitForGSLB(instance2)
err = instance1.WaitForExpected([]string{})
require.NoError(t, err)
require.Nil(t, ip1)
require.Nil(t, ip2)
})

t.Run("start podinfo on the second cluster", func(t *testing.T) {
instance2.StartTestApp()
ip1, err := instance1.WaitForGSLB(instance2)
err = instance1.WaitForExpected(instance2LocalTargets)
require.NoError(t, err)
ip2, err := instance2.WaitForGSLB(instance1)
err = instance2.WaitForExpected(instance2LocalTargets)
require.NoError(t, err)
require.True(t, utils.EqualStringSlices(instance2LocalTargets, ip1))
require.True(t, utils.EqualStringSlices(instance2LocalTargets, ip2))
})

t.Run("start podinfo on the first cluster", func(t *testing.T) {
// start app in the both clusters
instance1.StartTestApp()
_, err = instance1.WaitForExpected(expectedIPs)
err = instance1.WaitForExpected(expectedIPs)
require.NoError(t, err)
_, err = instance2.WaitForExpected(expectedIPs)
err = instance2.WaitForExpected(expectedIPs)
require.NoError(t, err)
})
}
5 changes: 3 additions & 2 deletions terratest/utils/extensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,9 @@ func (i *Instance) WaitForGSLB(instances ...*Instance) ([]string, error) {
}

// WaitForExpected waits until GSLB dig doesnt return list of expected IP's
func (i *Instance) WaitForExpected(expectedIPs []string) ([]string, error) {
return waitForLocalGSLBNew(i.w.t, i.w.state.gslb.host, i.w.state.gslb.port, expectedIPs)
func (i *Instance) WaitForExpected(expectedIPs []string) (err error) {
_, err = waitForLocalGSLBNew(i.w.t, i.w.state.gslb.host, i.w.state.gslb.port, expectedIPs)
return
}

func (i *Instance) String() string {
Expand Down