Skip to content

Commit 2cf9795

Browse files
committed
Fix tests to support latest Docker version
1 parent 5f25058 commit 2cf9795

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

tests/FunctionalClientTest.php

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,21 @@ public function testCreateStartAndRemoveContainer()
9191
$promise = $this->client->events($start, $end, array('container' => array($container['Id'])));
9292
$ret = \React\Async\await($promise);
9393

94-
// expects "start", "attach", "kill", "die", "destroy" events
95-
$this->assertEquals(5, count($ret));
96-
$this->assertEquals('start', $ret[0]['status']);
97-
$this->assertEquals('attach', $ret[1]['status']);
98-
$this->assertEquals('kill', $ret[2]['status']);
99-
$this->assertEquals('die', $ret[3]['status']);
100-
$this->assertEquals('destroy', $ret[4]['status']);
94+
$this->assertIsArray($ret);
95+
96+
$status = array(); // array_column($ret, 'status'); // PHP 5.5+
97+
foreach ($ret as $one) {
98+
$status[] = $one['status'];
99+
}
100+
101+
// expect 4 events as of ~2021, 5 in earlier versions
102+
if (count($status) === 4) {
103+
// start, die, attach, destroy
104+
$this->assertEquals(array('start', 'die', 'attach', 'destroy'), $status);
105+
} else {
106+
// expects "start", "attach", "kill", "die", "destroy" events
107+
$this->assertEquals(array('start', 'attach', 'kill', 'die', 'destroy'), $status);
108+
}
101109
}
102110

103111
/**

0 commit comments

Comments
 (0)