From 46abea58554a203b230d529c25b140299752072c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= <ldoktor@redhat.com>
Date: Fri, 5 Jun 2015 15:08:52 +0200
Subject: [PATCH] avocado.multiplexer: Evaluate abspath from right
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

One of the requirements is to evaluate paths from right to left. This
works fine with relative paths, but was intentionally disabled for
absolute paths. Anyway this behavior is wrong and both, absolute and
relative, paths should be evaluated from right to left and allow
remaining path on left.

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
---
 avocado/multiplexer.py                           | 16 ++++++----------
 .../all/unit/avocado/multiplexer_unittest.py     |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/avocado/multiplexer.py b/avocado/multiplexer.py
index fbc1f5fa..67fd974a 100644
--- a/avocado/multiplexer.py
+++ b/avocado/multiplexer.py
@@ -198,7 +198,7 @@ class AvocadoParams(object):
         :param leaves: list of TreeNode leaves
         """
         path = self._greedy_path(path)
-        path_leaves = [leaf for leaf in leaves if path.match(leaf.path + '/')]
+        path_leaves = [leaf for leaf in leaves if path.search(leaf.path + '/')]
         for leaf in path_leaves:
             leaves.remove(leaf)
         return path_leaves
@@ -207,9 +207,9 @@ class AvocadoParams(object):
     def _greedy_path(path):
         """
         converts user-friendly asterisk path to python regexp and compiles it:
-        path = ""             => ^$ only
-        path = "/"            => / only
-        path = "/asdf/fdsa"   => /asdf/fdsa only
+        path = ""             => ^$
+        path = "/"            => /
+        path = "/asdf/fdsa"   => /asdf/fdsa
         path = "asdf/fdsa"    => $MUX_ENTRY/?.*/asdf/fdsa
         path = "/*/asdf"      => /[^/]*/asdf
         path = "asdf/*"       => $MUX_ENTRY/?.*/asdf/.*
@@ -217,16 +217,12 @@ class AvocadoParams(object):
         """
         if not path:
             return re.compile('^$')
-        if path[0] != '/':
-            prefix = '.*/'
-        else:
-            prefix = ''
         if path[-1] == '*':
             suffix = ''
             path = path[:-1]
         else:
             suffix = '$'
-        return re.compile(prefix + path.replace('*', '[^/]*') + suffix)
+        return re.compile(path.replace('*', '[^/]*') + suffix)
 
     @staticmethod
     def _is_abspath(path):
@@ -351,7 +347,7 @@ class AvocadoParam(object):
         """
         return [self._leaves[i]
                 for i in xrange(len(self._leaf_names))
-                if path.match(self._leaf_names[i])]
+                if path.search(self._leaf_names[i])]
 
     def get_or_die(self, path, key):
         """
diff --git a/selftests/all/unit/avocado/multiplexer_unittest.py b/selftests/all/unit/avocado/multiplexer_unittest.py
index 08da0c07..91f3ebd2 100644
--- a/selftests/all/unit/avocado/multiplexer_unittest.py
+++ b/selftests/all/unit/avocado/multiplexer_unittest.py
@@ -124,10 +124,10 @@ class TestAvocadoParams(unittest.TestCase):
     def test_get_greedy_path(self):
         self.assertEqual(self.params1.get('unique1', '/*/*/*/ch0.1.1.1/',
                                           111), 'unique1')
-        # not in this level (-1)
+        # evaluated from right
         self.assertEqual(self.params1.get('unique1', '/*/*/ch0.1.1.1/', 222),
-                         222)
-        # not in this level (+1)
+                         'unique1')
+        # path too long so can't match from right
         self.assertEqual(self.params1.get('unique1', '/*/*/*/*/ch0.1.1.1/',
                                           333), 333)
         self.assertEqual(self.params1.get('unique1', '/ch*/c*1/*0*/*1/',
-- 
GitLab