m/n/c/update/e2e: remove unreachable code
t.Fatal does not return, anything after is unreachable.
Change-Id: Id67e523911b733a6992e0166c422f821c268fea2
Reviewed-on: https://review.monogon.dev/c/monogon/+/2977
Vouch-Run-CI: Lorenz Brun <lorenz@monogon.tech>
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/node/core/update/e2e/e2e_test.go b/metropolis/node/core/update/e2e/e2e_test.go
index d7cce0d..0f712a8 100644
--- a/metropolis/node/core/update/e2e/e2e_test.go
+++ b/metropolis/node/core/update/e2e/e2e_test.go
@@ -92,17 +92,11 @@
}
select {
case <-procExit:
- return
case <-ctx.Done():
t.Fatal("Timed out waiting for VM to exit")
- cancel()
- <-procExit
- t.FailNow()
- return
}
case err := <-procExit:
t.Fatalf("QEMU exited unexpectedly: %v", err)
- return
case <-ctx.Done():
t.Fatalf("Waiting for TestOS variant %s launch timed out", expectedVariant)
}
@@ -122,7 +116,6 @@
p, ok := b.bundlePaths[variant]
if !ok {
b.t.Fatalf("no bundle for variant %s available", variant)
- return
}
b.bundleFilePath = p
}
@@ -325,7 +318,6 @@
t.Logf("Got %s, installing %s", variant, expectedVariant)
case err := <-procExit:
t.Fatalf("QEMU exited unexpectedly: %v", err)
- return
case <-ctx.Done():
t.Fatalf("Waiting for TestOS variant %s launch timed out", expectedVariant)
}