From f31c32b9edbdcff41d6d0a9fdf3ac03deac9f356 Mon Sep 17 00:00:00 2001
From: Warren Usui <wusui@redhat.com>
Date: Wed, 11 Apr 2018 00:31:40 +0000
Subject: [PATCH] Fix test that failed.

---
 teuthology/suite/test/test_build_matrix.py | 92 ++++++++++++++++++----
 1 file changed, 77 insertions(+), 15 deletions(-)

diff --git a/teuthology/suite/test/test_build_matrix.py b/teuthology/suite/test/test_build_matrix.py
index 28728a984e..8447177e3c 100644
--- a/teuthology/suite/test/test_build_matrix.py
+++ b/teuthology/suite/test/test_build_matrix.py
@@ -193,9 +193,29 @@ class TestBuildMatrix(object):
                 },
             },
         }
-        self.start_patchers(fake_fs)
-        result = build_matrix.build_matrix('d0_0')
-        assert len(result) == 1
+        fake_fs1 = {
+            'd0_0$': {
+                'd1_0': {
+                    'd1_0_0.yaml': None,
+                    'd1_0_1.yaml': None,
+                },
+                'd1_1': {
+                    'd1_1_0.yaml': None,
+                    'd1_1_1.yaml': None,
+                },
+                'd1_2': {
+                    'd1_2_0.yaml': None,
+                    'd1_2_1.yaml': None,
+                    'd1_2_2.yaml': None,
+                },
+            },
+        }
+        for info in [(fake_fs,'d0_0'), (fake_fs1,'d0_0$')]:
+            fsv = info[0]
+            dval = info[1]
+            self.start_patchers(fsv)
+            result = build_matrix.build_matrix(dval)
+            assert len(result) == 1
 
     def test_random_dollar_sign_with_concat(self):
         fake_fs = {
@@ -217,15 +237,36 @@ class TestBuildMatrix(object):
                 },
             },
         }
-        self.start_patchers(fake_fs)
-        result = build_matrix.build_matrix('d0_0')
-        assert len(result) == 1
-        if result[0][0][1:].startswith('d1_2'):
-            for i in result:
-                assert 'd0_0/d1_2/d1_2_0.yaml' in i[1]
-                assert 'd0_0/d1_2/d1_2_1.yaml' in i[1]
-                assert 'd0_0/d1_2/d1_2_2.yaml' in i[1]
-                assert 'd0_0/d1_2/d1_2_3.yaml' in i[1]
+        fake_fs1 = {
+            'd0_0$': {
+                'd1_0': {
+                    'd1_0_0.yaml': None,
+                },
+                'd1_1': {
+                    'd1_1_0.yaml': None,
+                    'd1_1_1.yaml': None,
+                },
+                'd1_2': {
+                    '+': None,
+                    'd1_2_0.yaml': None,
+                    'd1_2_1.yaml': None,
+                    'd1_2_2.yaml': None,
+                    'd1_2_3.yaml': None,
+                },
+            },
+        }
+        for info in [(fake_fs,'d0_0'), (fake_fs1,'d0_0$')]:
+            fsv = info[0]
+            dval = info[1]
+            self.start_patchers(fsv)
+            result = build_matrix.build_matrix(dval)
+            assert len(result) == 1
+            if result[0][0][1:].startswith('d1_2'):
+                for i in result:
+                    assert 'd0_0/d1_2/d1_2_0.yaml' in i[1]
+                    assert 'd0_0/d1_2/d1_2_1.yaml' in i[1]
+                    assert 'd0_0/d1_2/d1_2_2.yaml' in i[1]
+                    assert 'd0_0/d1_2/d1_2_3.yaml' in i[1]
 
     def test_random_dollar_sign_with_convolve(self):
         fake_fs = {
@@ -247,9 +288,30 @@ class TestBuildMatrix(object):
                 },
             },
         }
-        self.start_patchers(fake_fs)
-        result = build_matrix.build_matrix('d0_0')
-        assert len(result) == 4
+        fake_fs1 = {
+            'd0_0': {
+                '%': None,
+                'd1_0': {
+                    'd1_0_0.yaml': None,
+                    'd1_0_1.yaml': None,
+                },
+                'd1_1': {
+                    'd1_1_0.yaml': None,
+                    'd1_1_1.yaml': None,
+                },
+                'd1_2$': {
+                    'd1_2_0.yaml': None,
+                    'd1_2_1.yaml': None,
+                    'd1_2_2.yaml': None,
+                },
+            },
+        }
+        for info in [(fake_fs,'d0_0'), (fake_fs1,'d0_0$')]:
+            fsv = info[0]
+            dval = info[1]
+            self.start_patchers(fsv)
+            result = build_matrix.build_matrix(dval)
+            assert len(result) == 4
 
     def test_emulate_teuthology_noceph(self):
         fake_fs = {
-- 
2.39.5