From 846f6fbe00eefcb97bc098a027a0a15cb39c00bf Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Wed, 19 Jun 2013 08:42:51 +0200 Subject: [PATCH] MDL-33955 filelib: accept any HTTP 1.0 in tests This is common with proxies like squid which don't support http pipelining. --- lib/tests/filelib_test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tests/filelib_test.php b/lib/tests/filelib_test.php index 5fbe6619dd0..191b4124d4b 100644 --- a/lib/tests/filelib_test.php +++ b/lib/tests/filelib_test.php @@ -105,7 +105,7 @@ class filelib_testcase extends advanced_testcase { $this->assertInstanceOf('stdClass', $response); $this->assertSame('200', $response->status); $this->assertTrue(is_array($response->headers)); - $this->assertSame('HTTP/1.1 200 OK', rtrim($response->response_code)); + $this->assertRegExp('|^HTTP/1\.[01] 200 OK$|', rtrim($response->response_code)); $this->assertSame($contents, $response->results); $this->assertSame('', $response->error); @@ -131,7 +131,7 @@ class filelib_testcase extends advanced_testcase { $this->assertInstanceOf('stdClass', $response); $this->assertSame('404', $response->status); $this->assertTrue(is_array($response->headers)); - $this->assertSame('HTTP/1.1 404 Not Found', rtrim($response->response_code)); + $this->assertRegExp('|^HTTP/1\.[01] 404 Not Found$|', rtrim($response->response_code)); $this->assertStringStartsWith('results); $this->assertSame('', $response->error); @@ -153,7 +153,7 @@ class filelib_testcase extends advanced_testcase { $this->assertInstanceOf('stdClass', $response); $this->assertSame('200', $response->status); $this->assertTrue(is_array($response->headers)); - $this->assertSame('HTTP/1.1 200 OK', rtrim($response->response_code)); + $this->assertRegExp('|^HTTP/1\.[01] 200 OK$|', rtrim($response->response_code)); $this->assertSame('done', $response->results); $this->assertSame('', $response->error);