Merge branch 'MAGETWO-31478' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-31478

Author: Michael Logvin

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php

@@ -51,13 +51,6 @@ class CustomerForm extends FormTabs
      */
     protected $fieldWrapperControl = './/*[contains(@class, "form__field")]/*[contains(@class,"control")]';
 
-    /**
-     * Table with customer information
-     *
-     * @var string
-     */
-    protected $dataTable = '.data-table';
-
     // @codingStandardsIgnoreStart
     /**
      * Field wrapper with absent control block on form.
@@ -101,7 +94,6 @@ public function fillCustomer(FixtureInterface $customer, $address = null)
     public function updateCustomer(FixtureInterface $customer, $address = null)
     {
         $this->waitForm();
-        $this->waitForElementVisible($this->dataTable);
 
         $isHasData = ($customer instanceof InjectableFixture) ? $customer->hasData() : true;
         if ($isHasData) {
@@ -125,7 +117,6 @@ public function updateCustomer(FixtureInterface $customer, $address = null)
     public function getDataCustomer(FixtureInterface $customer, $address = null)
     {
         $this->waitForm();
-        $this->waitForElementVisible($this->dataTable);
 
         $data = ['customer' => $customer->hasData() ? parent::getData($customer) : parent::getData()];
         if (null !== $address) {
@@ -146,6 +137,7 @@ protected function waitForm()
     {
         $this->waitForElementNotVisible($this->spinner);
         $this->waitForElementVisible($this->activeFormTab);
+        sleep(10); //@todo MAGETWO-33615
     }
 
     /**

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php

@@ -71,10 +71,6 @@ public function processAssert(
         $pageCustomerIndex->open();
         $pageCustomerIndex->getCustomerGridBlock()->searchAndOpen($filter);
 
-        /** @var \Magento\Mtf\System\Event\EventManagerInterface $eventManager */
-        $eventManager = $this->objectManager->get('Magento\Mtf\System\Event\EventManagerInterface');
-        $eventManager->dispatchEvent(['exception'], [var_export($data, true)]);
-
         $dataForm = $pageCustomerIndexEdit->getCustomerForm()->getDataCustomer($customer, $address);
         $dataDiff = $this->verify($data, $dataForm);
         \PHPUnit_Framework_Assert::assertTrue(