From 667bcc34cf1db96dbf28aa50a65f365e0dc829e7 Mon Sep 17 00:00:00 2001
From: asteroide <thomas.duval@orange.com>
Date: Fri, 18 Sep 2015 12:19:10 +0200
Subject: Change the way the data strings are replaced to allow similar
 variables on the same line.

Change-Id: I0ba5f0151ebc144015196b758c1bde587da63e7b
---
 moonclient/moonclient/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moonclient/moonclient/tests.py b/moonclient/moonclient/tests.py
index 63f1ed14..1e1020bf 100644
--- a/moonclient/moonclient/tests.py
+++ b/moonclient/moonclient/tests.py
@@ -33,7 +33,7 @@ class TestsLaunch(Lister):
     def __replace_var_in_str(self, data_str):
         for exp in re.findall("\$\w+", data_str):
             if exp.replace("$", "") in self.result_vars:
-                data_str = data_str.replace(exp, self.result_vars[exp.replace("$", "")])
+                data_str = re.sub(exp.replace("$", "\$") + "(?=$|\s)", self.result_vars[exp.replace("$", "")], data_str)
         return data_str
 
     def __compare_results(self, expected, observed):
-- 
cgit 1.2.3-korg