Merge remote-tracking branch 'origin/MAGETWO-87436-debug' into BugFixPR

Author: Joan He

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -36,15 +36,14 @@ protected function setUp()
      * @magentoAppIsolation enabled
      * @param int $categoryId
      * @param bool $expectedResult
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
+     * @magentoDataFixture Magento/SalesRule/_files/rules_category.php
      * @dataProvider validateProductConditionDataProvider
      * @magentoDbIsolation disabled
      */
     public function testValidateCategorySalesRuleIncludesChildren($categoryId, $expectedResult)
     {
-        //* @magentoDataFixture Magento/ConfigurableProduct/_files/quote_with_configurable_product.php
-        //* @magentoDataFixture Magento/SalesRule/_files/rules_category.php
-        $this->markTestSkipped('MAGETWO-87436');
-
         // Load the quote that contains a child of a configurable product
         /** @var \Magento\Quote\Model\Quote  $quote */
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class)