MAGETWO-37464: Merge and Fix Builds

- Update integration test assertion since common fixture was updated

Author: anupdugar

dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php

@@ -75,25 +75,16 @@ public function testGetNestedOptionsCustomAttributesMetadata()
     public function testGetCustomAttributesMetadataWithAttributeNamedCustomAttribute()
     {
         $customAttributesMetadata = $this->_service->getCustomAttributesMetadata();
-        $customAttributeCodeOne = 'custom_attribute1';
-        $customAttributeFound = false;
-        $customAttributeCodeTwo = 'custom_attribute2';
-        $customAttributesFound = false;
+        $expectedCustomAttributeCodeArray = ['custom_attribute1', 'custom_attribute2', 'customer_image'];
+        $actual = [];
         foreach ($customAttributesMetadata as $attribute) {
-            if ($attribute->getAttributeCode() == $customAttributeCodeOne) {
-                $customAttributeFound = true;
-            }
-            if ($attribute->getAttributeCode() == $customAttributeCodeTwo) {
-                $customAttributesFound = true;
-            }
-        }
-        if (!$customAttributeFound) {
-            $this->fail("Custom attribute declared in the config not found.");
+            $actual[] = $attribute->getAttributeCode();
         }
-        if (!$customAttributesFound) {
-            $this->fail("Custom attributes declared in the config not found.");
-        }
-        $this->assertCount(3, $customAttributesMetadata, "Invalid number of attributes returned.");
+        $this->assertEquals(
+            $expectedCustomAttributeCodeArray,
+            array_intersect($expectedCustomAttributeCodeArray, $actual),
+            "Expected attributes not returned from the service."
+        );
     }
 
     /**