[pitivi] layer: Fix significant layer name detection

[Alexandru Băluț <alexbalut src gnome org>]

commit 1dae6825fce65f71868afde2a6d8aae8418147fa
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Tue May 31 15:55:31 2016 +0200

    layer: Fix significant layer name detection
    
    The regular expression used was matching the beginning of the "Layer 0x"
    name and it was replaced by "Layer 0" because of this.
    
    Differential Revision: https://phabricator.freedesktop.org/D1036

 pitivi/timeline/layer.py     |    2 +-
 tests/test_timeline_layer.py |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 0e501ef..28afa97 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -389,7 +389,7 @@ class Layer(Gtk.EventBox, Zoomable, Loggable):
     def __nameIfMeaningful(self):
         name = self.__nameIfSet()
         if name:
-            for pattern in ("video [0-9]+", "audio [0-9]+", "Layer [0-9]+"):
+            for pattern in ("video [0-9]+$", "audio [0-9]+$", "Layer [0-9]+$"):
                 if re.match(pattern, name):
                     return None
         return name
diff --git a/tests/test_timeline_layer.py b/tests/test_timeline_layer.py
index e732aeb..0ffe4ba 100644
--- a/tests/test_timeline_layer.py
+++ b/tests/test_timeline_layer.py
@@ -32,13 +32,23 @@ class TestLayerControl(common.TestCase):
         ges_layer = GES.Layer()
         layer = Layer(ges_layer, timeline)
         self.assertEqual(layer.getName(), "Layer 0", "Default name generation failed")
+
         ges_layer.set_meta("audio::name", "a")
         self.assertEqual(layer.getName(), "a", "Cannot use old audio name")
+
         ges_layer.set_meta("video::name", "v")
         self.assertEqual(layer.getName(), "v", "Cannot use old video name")
+
         layer.setName("vv")
         self.assertEqual(layer.getName(), "vv")
 
+    def test_name_meaningful(self):
+        timeline = mock.MagicMock()
+        ges_layer = GES.Layer()
+        layer = Layer(ges_layer, timeline)
+        layer.setName("Layer 0x")
+        self.assertEqual(layer.getName(), "Layer 0x")
+
 
 class TestLayer(common.TestCase):