From 98381d5ab77ddcf7c88d070e551be6258c1da2d2 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Tue, 26 Sep 2023 11:14:46 +0100 Subject: [PATCH] MDL-79477 tool_moodlenet: better handling of network download test. We can't assume the presense of `Content-Length` header in response to a HEAD request. Modify test assertion to account for this. --- .../moodlenet/tests/local/remote_resource_test.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/admin/tool/moodlenet/tests/local/remote_resource_test.php b/admin/tool/moodlenet/tests/local/remote_resource_test.php index 500f95af4b2..f3195fb7a9c 100644 --- a/admin/tool/moodlenet/tests/local/remote_resource_test.php +++ b/admin/tool/moodlenet/tests/local/remote_resource_test.php @@ -98,7 +98,15 @@ class remote_resource_test extends \advanced_testcase { ] ); - $this->assertGreaterThan(0, $remoteres->get_download_size()); + // We need to handle size of -1 (missing "Content-Length" header), or where it is set and greater than zero. + $this->assertThat( + $remoteres->get_download_size(), + $this->logicalOr( + $this->equalTo(-1), + $this->greaterThan(0), + ), + ); + [$path, $name] = $remoteres->download_to_requestdir(); $this->assertIsString($path); $this->assertEquals('test.html', $name);