merge magento/2.4-develop into magento-honey-badgers/MC-18332-remake

magento-mts-svc · web-flow · commit eda7ef1a814b · 2020-05-21T14:43:37.000-07:00
diff --git a/dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
@@ -49,6 +49,7 @@ class AdminTokenServiceTest extends WebapiAbstract
      */
     protected function setUp(): void
     {
+        $this->markTestSkipped('Skipped until MC-34201 is addressed');
         $this->_markTestAsRestOnly();
         $this->tokenService = Bootstrap::getObjectManager()->get(\Magento\Integration\Model\AdminTokenService::class);
         $this->tokenModel = Bootstrap::getObjectManager()->get(\Magento\Integration\Model\Oauth\Token::class);

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ class AdminTokenServiceTest extends WebapiAbstract`
`49`	`49`	`*/`
`50`	`50`	`protected function setUp(): void`
`51`	`51`	`{`
	`52`	`+ $this->markTestSkipped('Skipped until MC-34201 is addressed');`
`52`	`53`	`$this->_markTestAsRestOnly();`
`53`	`54`	`$this->tokenService = Bootstrap::getObjectManager()->get(\Magento\Integration\Model\AdminTokenService::class);`
`54`	`55`	`$this->tokenModel = Bootstrap::getObjectManager()->get(\Magento\Integration\Model\Oauth\Token::class);`