Merge pull request #618 from magento-troll/MAGETWO-61132

rganin · web-flow · commit 4bc9fcc56b57 · 2016-11-25T13:19:53.000+02:00
MAGETWO-61132: Integration test Magento\Directory\Model\ObserverTest fails due to 3rd party service outage
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -62,12 +62,12 @@ public function testScheduledUpdateCurrencyRates()
     {
         //skipping test if service is unavailable
         $url = str_replace('{{CURRENCY_FROM}}', 'USD',
-            \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL
+            \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL
         );
         $url = str_replace('{{CURRENCY_TO}}', 'GBP', $url);
         try {
             file_get_contents($url);
-        } catch (\PHPUnit_Framework_Error_Warning $e) {
+        } catch (\PHPUnit_Framework_Exception $e) {
             $this->markTestSkipped('http://www.webservicex.net is unavailable ');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@ public function testScheduledUpdateCurrencyRates()`
`62`	`62`	`{`
`63`	`63`	`//skipping test if service is unavailable`
`64`	`64`	`$url = str_replace('{{CURRENCY_FROM}}', 'USD',`
`65`		`- \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL`
	`65`	`+ \Magento\Directory\Model\Currency\Import\Webservicex::CURRENCY_CONVERTER_URL`
`66`	`66`	`);`
`67`	`67`	`$url = str_replace('{{CURRENCY_TO}}', 'GBP', $url);`
`68`	`68`	`try {`
`69`	`69`	`file_get_contents($url);`
`70`		`- } catch (\PHPUnit_Framework_Error_Warning $e) {`
	`70`	`+ } catch (\PHPUnit_Framework_Exception $e) {`
`71`	`71`	`$this->markTestSkipped('http://www.webservicex.net is unavailable ');`
`72`	`72`	`}`
`73`	`73`