bug #40239 MockResponse total_time should not be simulated when provided (Pierrick VIGNAND)

nicolas-grekas · nicolas-grekas · commit a5683c53248a · 2021-02-26T11:01:20.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- MockResponse total_time should not be simulated when provided | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | When you provide a `total_time` to a MockResponse, it is overriden. It should be simulated only when it is not provided I guess. Ex: `new MockResponse('{"foo":"bar"}', ['total_time' => 0.4])` Commits ------- 8dada95 fix: MockResponse total_time should not be simulated when provided
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -211,8 +211,8 @@ private static function writeRequest(self $response, array $options, ResponseInt
             $response->info['size_upload'] = 0.0;
         }
 
-        // simulate "total_time" if it is set
-        if (isset($response->info['total_time'])) {
+        // simulate "total_time" if it is not set
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
@@ -260,7 +260,7 @@ private static function readResponse(self $response, array $options, ResponseInt
             'http_code' => $response->info['http_code'],
         ] + $info + $response->info;
 
-        if (isset($response->info['total_time'])) {
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
@@ -287,7 +287,7 @@ private static function readResponse(self $response, array $options, ResponseInt
             $offset = \strlen($body);
         }
 
-        if (isset($response->info['total_time'])) {
+        if (!isset($response->info['total_time'])) {
             $response->info['total_time'] = microtime(true) - $response->info['start_time'];
         }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -11,6 +11,24 @@
  */
 class MockResponseTest extends TestCase
 {
+    public function testTotalTimeShouldBeSimulatedWhenNotProvided()
+    {
+        $response = new MockResponse('body');
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.txt', [], $response);
+
+        $this->assertNotNull($response->getInfo('total_time'));
+        $this->assertGreaterThan(0.0, $response->getInfo('total_time'));
+    }
+
+    public function testTotalTimeShouldNotBeSimulatedWhenProvided()
+    {
+        $totalTime = 4.2;
+        $response = new MockResponse('body', ['total_time' => $totalTime]);
+        $response = MockResponse::fromRequest('GET', 'https://example.com/file.txt', [], $response);
+
+        $this->assertEquals($totalTime, $response->getInfo('total_time'));
+    }
+
     public function testToArray()
     {
         $data = ['color' => 'orange', 'size' => 42];

Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,8 @@ private static function writeRequest(self $response, array $options, ResponseInt`
`211`	`211`	`$response->info['size_upload'] = 0.0;`
`212`	`212`	`}`
`213`	`213`
`214`		`- // simulate "total_time" if it is set`
`215`		`- if (isset($response->info['total_time'])) {`
	`214`	`+ // simulate "total_time" if it is not set`
	`215`	`+ if (!isset($response->info['total_time'])) {`
`216`	`216`	`$response->info['total_time'] = microtime(true) - $response->info['start_time'];`
`217`	`217`	`}`
`218`	`218`
`@@ -260,7 +260,7 @@ private static function readResponse(self $response, array $options, ResponseInt`
`260`	`260`	`'http_code' => $response->info['http_code'],`
`261`	`261`	`] + $info + $response->info;`
`262`	`262`
`263`		`- if (isset($response->info['total_time'])) {`
	`263`	`+ if (!isset($response->info['total_time'])) {`
`264`	`264`	`$response->info['total_time'] = microtime(true) - $response->info['start_time'];`
`265`	`265`	`}`
`266`	`266`
`@@ -287,7 +287,7 @@ private static function readResponse(self $response, array $options, ResponseInt`
`287`	`287`	`$offset = \strlen($body);`
`288`	`288`	`}`
`289`	`289`
`290`		`- if (isset($response->info['total_time'])) {`
	`290`	`+ if (!isset($response->info['total_time'])) {`
`291`	`291`	`$response->info['total_time'] = microtime(true) - $response->info['start_time'];`
`292`	`292`	`}`
`293`	`293`