Fixed functional test issues

Azure · Mar 31, 2017 · 9aa46e3 · 9aa46e3
1 parent e7d1e5d
commit 9aa46e3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/src/Common/Internal/ACLBase.php b/src/Common/Internal/ACLBase.php
@@ -206,7 +206,7 @@ public function addSignedIdentifier(
 
         // There can be no more than 5 signed identifiers at the same time.
         Validate::isTrue(
-            count($this->getSignedIdentifiers()) <= 5,
+            count($this->getSignedIdentifiers()) < 5,
             Resources::ERROR_TOO_MANY_SIGNED_IDENTIFIERS
         );
 

diff --git a/src/Common/Internal/Serialization/MessageSerializer.php b/src/Common/Internal/Serialization/MessageSerializer.php
@@ -46,7 +46,6 @@ class MessageSerializer
      * Serialize a message to a string. The message object must be either a type
      * of \Exception, or have following methods implemented.
      * getHeaders()
-     * getBody()
      * getProtocolVersion()
      * (getUri() && getMethod()) || (getStatusCode() && getReasonPhrase())
      *
@@ -65,7 +64,6 @@ public static function objectSerialize($targetObject)
         }
 
         Validate::methodExists($targetObject, 'getHeaders', 'targetObject');
-        Validate::methodExists($targetObject, 'getBody', 'targetObject');
         Validate::methodExists($targetObject, 'getProtocolVersion', 'targetObject');
 
         // Serialize according to the implemented method.
@@ -85,7 +83,6 @@ public static function objectSerialize($targetObject)
     /**
      * Serialize the request type that implemented the following methods:
      * getHeaders()
-     * getBody()
      * getProtocolVersion()
      * getUri()
      * getMethod()
@@ -97,23 +94,20 @@ public static function objectSerialize($targetObject)
     private static function serializeRequest($request)
     {
         $headers = $request->getHeaders();
-        $body    = $request->getBody();
         $version = $request->getProtocolVersion();
         $uri     = $request->getUri();
         $method  = $request->getMethod();
 
         $resultString = "Request:\n";
         $resultString .= "URI: {$uri}\nHTTP Version: {$version}\nMethod: {$method}\n";
         $resultString .= self::serializeHeaders($headers);
-        $resultString .= "Request Body:\n{$body}\n";
 
         return $resultString;
     }
 
     /**
      * Serialize the response type that implemented the following methods:
      * getHeaders()
-     * getBody()
      * getProtocolVersion()
      * getStatusCode()
      * getReasonPhrase()
@@ -125,7 +119,6 @@ private static function serializeRequest($request)
     private static function serializeResponse($response)
     {
         $headers = $response->getHeaders();
-        $body    = $response->getBody();
         $version = $response->getProtocolVersion();
         $status  = $response->getStatusCode();
         $reason  = $response->getReasonPhrase();
@@ -134,7 +127,6 @@ private static function serializeResponse($response)
         $resultString .= "Status Code: {$status}\nReason: {$reason}\n";
         $resultString .= "HTTP Version: {$version}\n";
         $resultString .= self::serializeHeaders($headers);
-        $resultString .= "Request Body:\n{$body}\n";
 
         return $resultString;
     }

diff --git a/tests/functional/Blob/BlobServiceFunctionalTest.php b/tests/functional/Blob/BlobServiceFunctionalTest.php
@@ -48,6 +48,7 @@
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Client;
 
 class BlobServiceFunctionalTest extends FunctionalTestBase
 {
@@ -1194,14 +1195,17 @@ private function verifySetContainerACLWorker($ret, $container, $acl, $blobConten
 
     private function canDownloadFromUrl($blobAddress, $expectedStartingValue)
     {
-        $url = parse_url($blobAddress);
-        $host = $url['host'];
-        $fp = fsockopen($host, '80');
-        $request = 'GET ' . $blobAddress . ' HTTP/1.1' . "\r\n" . 'Host: ' . $host ."\r\n\r\n";
-        fputs($fp, $request);
-        $value = fread($fp, 1000);
-        fclose($fp);
-        return strpos($value, $expectedStartingValue) !== false;
+        $client = new Client();
+        $body = '';
+        try {
+            $response = $client->request('GET', $blobAddress);
+            $body = $response->getBody();
+        } catch (RequestException $e) {
+            if ($e->hasResponse()) {
+                $body = $e->getResponse()->getBody();
+            }
+        }
+        return strpos($body, $expectedStartingValue) !== false;
     }
 
     /**

diff --git a/tests/functional/Queue/QueueServiceFunctionalTestData.php b/tests/functional/Queue/QueueServiceFunctionalTestData.php
@@ -34,7 +34,10 @@
 
 class QueueServiceFunctionalTestData
 {
-    const INTERESTING_TTL = 4;
+    //Needs to keep this value as low as possible to quicken the test
+    //but if the test machine is slow, a small value will cause unexpected
+    //failures. Default value: 20.
+    const INTERESTING_TTL = 20;
     public static $testUniqueId;
     public static $tempQueueCounter;
     public static $nonExistQueuePrefix;

diff --git a/tests/unit/Table/Models/EdmTypeTest.php b/tests/unit/Table/Models/EdmTypeTest.php
@@ -223,7 +223,6 @@ public function testValidateEdmValueWithDouble()
         $values[]  = PHP_INT_MAX;
         $values[]  = pi();
         $values[]  = 1.0;
-        $values[]  = PHP_INT_MIN;
         $expected  = true;
 
         // Test