mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-08 19:47:56 +00:00
e2e lifecycle: fix finishing -> exiting
Signed-off-by: Matthias Bertschy <matthias.bertschy@gmail.com>
This commit is contained in:
parent
851d149a88
commit
8833b4def0
@ -124,8 +124,8 @@ func (o containerOutputList) RunTogether(lhs, rhs string) error {
|
|||||||
lhsStart := o.findIndex(lhs, "Started", 0)
|
lhsStart := o.findIndex(lhs, "Started", 0)
|
||||||
rhsStart := o.findIndex(rhs, "Started", 0)
|
rhsStart := o.findIndex(rhs, "Started", 0)
|
||||||
|
|
||||||
lhsFinish := o.findIndex(lhs, "Finishing", 0)
|
lhsFinish := o.findIndex(lhs, "Exiting", 0)
|
||||||
rhsFinish := o.findIndex(rhs, "Finishing", 0)
|
rhsFinish := o.findIndex(rhs, "Exiting", 0)
|
||||||
|
|
||||||
if lhsStart == -1 {
|
if lhsStart == -1 {
|
||||||
return fmt.Errorf("couldn't find that %s ever started, got\n%v", lhs, o)
|
return fmt.Errorf("couldn't find that %s ever started, got\n%v", lhs, o)
|
||||||
@ -135,11 +135,11 @@ func (o containerOutputList) RunTogether(lhs, rhs string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if lhsFinish != -1 && rhsStart > lhsFinish {
|
if lhsFinish != -1 && rhsStart > lhsFinish {
|
||||||
return fmt.Errorf("expected %s to start before finishing %s, got\n%v", rhs, lhs, o)
|
return fmt.Errorf("expected %s to start before exiting %s, got\n%v", rhs, lhs, o)
|
||||||
}
|
}
|
||||||
|
|
||||||
if rhsFinish != -1 && lhsStart > rhsFinish {
|
if rhsFinish != -1 && lhsStart > rhsFinish {
|
||||||
return fmt.Errorf("expected %s to start before finishing %s, got\n%v", lhs, rhs, o)
|
return fmt.Errorf("expected %s to start before exiting %s, got\n%v", lhs, rhs, o)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
Loading…
Reference in New Issue
Block a user