mirror of
https://github.com/mulgadc/spinifex.git
synced 2026-10-19 10:52:04 +00:00
fix: ack vpc.delete-nat in tests so teardown doesn't wait out the 15 s request timeout
This commit is contained in:
@@ -799,6 +799,7 @@ func TestLaunchSystemInstance_NATFailureRollsBackPublicIP(t *testing.T) {
|
||||
// rule vpcd may have committed after the AddNAT timeout window.
|
||||
deleteNATCh := make(chan map[string]string, 1)
|
||||
delSub, err := d.natsConn.Subscribe("vpc.delete-nat", func(msg *nats.Msg) {
|
||||
_ = msg.Respond([]byte(`{"success":true}`))
|
||||
var p map[string]string
|
||||
_ = json.Unmarshal(msg.Data, &p)
|
||||
select {
|
||||
|
||||
@@ -3882,6 +3882,7 @@ func TestPrepareRunInstances_NATFailureRollsBackPublicIP(t *testing.T) {
|
||||
// half-committed rule from a waitForFlowsHV timeout.
|
||||
deleteNATCh := make(chan natWirePayload, 1)
|
||||
delSub, err := svc.natsConn.Subscribe("vpc.delete-nat", func(msg *nats.Msg) {
|
||||
_ = msg.Respond([]byte(`{"success":true}`))
|
||||
var p natWirePayload
|
||||
_ = json.Unmarshal(msg.Data, &p)
|
||||
select {
|
||||
@@ -3989,6 +3990,7 @@ func TestPrepareRunInstances_PartialLaunchReleasesSucceededInstances(t *testing.
|
||||
|
||||
deleteNATCh := make(chan natWirePayload, 2)
|
||||
delSub, err := svc.natsConn.Subscribe("vpc.delete-nat", func(msg *nats.Msg) {
|
||||
_ = msg.Respond([]byte(`{"success":true}`))
|
||||
var p natWirePayload
|
||||
_ = json.Unmarshal(msg.Data, &p)
|
||||
select {
|
||||
|
||||
@@ -101,6 +101,7 @@ var vpcdStubTopics = []string{
|
||||
"vpc.update-port-sgs",
|
||||
"vpc.create-port",
|
||||
"vpc.delete-port",
|
||||
"vpc.delete-nat",
|
||||
}
|
||||
|
||||
// vpcdStubRegistry holds the per-conn response map. Per-conn so concurrent tests with separate conns don't interfere.
|
||||
|
||||
Reference in New Issue
Block a user