Fix exception messages containing exception messages

Author: nicolas-grekas

Templating/Loader/TemplateLocator.php

@@ -79,7 +79,7 @@ public function locate($template, $currentPath = null, $first = true)
         try {
             return $this->cacheHits[$key] = $this->locator->locate($template->getPath(), $currentPath);
         } catch (\InvalidArgumentException $e) {
-            throw new \InvalidArgumentException(sprintf('Unable to find template "%s" : "%s".', $template, $e->getMessage()), 0, $e);
+            throw new \InvalidArgumentException(sprintf('Unable to find template "%s": ', $template).$e->getMessage(), 0, $e);
         }
     }
 }

Tests/Functional/CachePoolsTest.php

@@ -40,7 +40,7 @@ public function testRedisCachePools()
             }
             $this->markTestSkipped($e->getMessage());
         } catch (InvalidArgumentException $e) {
-            if (0 !== strpos($e->getMessage(), 'Redis connection failed')) {
+            if (0 !== strpos($e->getMessage(), 'Redis connection ')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());