fixing integration tests

Author: Jamie Hannaford

src/Common/Api/Operation.php

@@ -124,8 +124,6 @@ public static function toParamArray(array $data)
      */
     public function validate(array $userValues)
     {
-        $this->checkDisallowedKeys($userValues);
-
         foreach ($this->params as $paramName => $param) {
             if (array_key_exists($paramName, $userValues)) {
                 $param->validate($userValues[$paramName]);
@@ -136,13 +134,4 @@ public function validate(array $userValues)
 
         return true;
     }
-
-    private function checkDisallowedKeys(array $userValues)
-    {
-        if (!empty($disallowedKeys = array_keys(array_diff_key($userValues, $this->params)))) {
-            throw new \Exception(sprintf(
-                'The following keys are not supported: %s', implode($disallowedKeys, ', ')
-            ));
-        }
-    }
 }

src/Common/Api/Parameter.php

@@ -211,7 +211,7 @@ private function validateEnums($userValues)
     {
         if (!empty($this->enum) && $this->type == 'string' && !in_array($userValues, $this->enum)) {
             throw new \Exception(sprintf(
-                'The only permitted values are %s. You provided %s', implode(', ', $this->enum), $userValues
+                'The only permitted values are %s. You provided %s', implode(', ', $this->enum), print_r($userValues, true)
             ));
         }
     }
@@ -220,8 +220,8 @@ private function validateType($userValues)
     {
         if (!$this->hasCorrectType($userValues)) {
             throw new \Exception(sprintf(
-                'The key provided "%s" has the wrong value type. You provided %s but was expecting %s',
-                $this->name, print_r($userValues, true), $this->type
+                'The key provided "%s" has the wrong value type. You provided %s (%s) but was expecting %s',
+                $this->name, print_r($userValues, true), gettype($userValues), $this->type
             ));
         }
     }

src/Common/Resource/HasWaiterTrait.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace OpenStack\Common\Resource;
+use OpenStack\Common\Error\BadResponseError;
 
 /**
  * Contains reusable functionality for resources that have long operations which require waiting in
@@ -97,4 +98,26 @@ public function waitUntilActive($timeout = 60)
     {
         $this->waitUntil('ACTIVE');
     }
+
+    public function waitUntilDeleted($timeout = 60, $sleepPeriod = 1)
+    {
+        $startTime = time();
+
+        while (true) {
+            try {
+                $this->retrieve();
+            } catch (BadResponseError $e) {
+                if ($e->getResponse()->getStatusCode() === 404) {
+                    break;
+                }
+                throw $e;
+            }
+
+            if ($this->shouldHalt($timeout, $startTime)) {
+                break;
+            }
+
+            sleep($sleepPeriod);
+        }
+    }
 }

src/ObjectStore/v1/Params.php

@@ -162,7 +162,7 @@ public function metadata($type, $remove = false)
 
         return [
             'location'    => self::HEADER,
-            'type'        => self::OBJECT_TYPE,
+            'type'        => self::ARRAY_TYPE,
             'prefix'      => sprintf("X-%s-Meta-", ucfirst($type)),
             'description' => <<<EOT
 Human-readable key/value pairs that help describe and determine what type of resource it is. You can specify whichever

tests/integration/BlockStorage/V2Test.php

@@ -36,6 +36,8 @@ public function runTests()
         $this->volumes();
         $this->volumeTypes();
         $this->snapshots();
+
+        $this->outputTimeTaken();
     }
 
     public function volumes()
@@ -45,7 +47,7 @@ public function volumes()
 
         $replacements = [
             '{description}' => $this->randomStr(),
-            '{size}'        => 1,
+            "'{size}'"      => 1,
             '{name}'        => $this->randomStr(),
             '{volumeType}'  => $volumeType->id,
             '{key1}'        => $this->randomStr(),
@@ -57,10 +59,11 @@ public function volumes()
         require_once $this->sampleFile($replacements, 'volumes/create.php');
         $this->assertInstanceOf(Volume::class, $volume);
         $this->assertEquals($replacements['{name}'], $volume->name);
-        $this->assertEquals(5, $volume->size);
+        $this->assertEquals(1, $volume->size);
         $this->assertEquals($volumeType->name, $volume->volumeTypeName);
 
-        $replacements = ['{volumeId}' => $volume->id];
+        $volumeId = $volume->id;
+        $replacements = ['{volumeId}' => $volumeId];
 
         $this->logStep('Getting volume');
         /** @var Volume $volume */
@@ -81,6 +84,9 @@ public function volumes()
         $this->logStep('Deleting volume');
         require_once $this->sampleFile($replacements, 'volumes/delete.php');
 
+        $volume = $this->getService()->getVolume($volumeId);
+        $volume->waitUntilDeleted();
+
         $this->logStep('Deleting volume type');
         $volumeType->delete();
     }
@@ -174,6 +180,7 @@ public function snapshots()
 
         $this->logStep('Deleting snapshot');
         require_once $this->sampleFile($replacements, 'snapshots/delete.php');
+        $snapshot->waitUntilDeleted();
 
         $this->logStep('Deleting volume');
         $volume->delete();

tests/integration/Identity/V2Test.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace OpenStack\Integration\Identity;
+
+use OpenStack\Integration\TestCase;
+
+class V2Test extends TestCase
+{
+    public function getBasePath()
+    {
+    }
+
+    public function runTests()
+    {
+    }
+}

tests/integration/Identity/V3Test.php

@@ -35,6 +35,8 @@ public function runTests()
 
         $this->tokens();
         $this->domains();
+
+        $this->outputTimeTaken();
     }
 
     public function tokens()

tests/integration/Images/V2Test.php

@@ -34,6 +34,8 @@ public function runTests()
 
         $this->images();
         $this->members();
+
+        $this->outputTimeTaken();
     }
 
     public function images()

tests/integration/ObjectStore/V1Test.php

@@ -35,6 +35,8 @@ public function runTests()
         $this->accountMetadata();
         $this->containers();
         $this->objects();
+
+        $this->outputTimeTaken();
     }
 
     public function accountMetadata()

tests/integration/TestCase.php

@@ -27,6 +27,8 @@ public function __construct(LoggerInterface $logger, $verbosity)
 
     abstract protected function getBasePath();
 
+    abstract protected function runTests();
+
     protected function getAuthOptsV3()
     {
         return [