From e16936b5f0e0a978c4ff7ea1b0d39fdccb52ada8 Mon Sep 17 00:00:00 2001
From: Warren Usui <wusui@redhat.com>
Date: Tue, 10 Apr 2018 23:25:58 +0000
Subject: [PATCH] Take out unittest to see if this caused failure.

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

diff --git a/teuthology/suite/test/test_build_matrix.py b/teuthology/suite/test/test_build_matrix.py
index 97784fcc3d..28728a984e 100644
--- a/teuthology/suite/test/test_build_matrix.py
+++ b/teuthology/suite/test/test_build_matrix.py
@@ -193,29 +193,9 @@ class TestBuildMatrix(object):
                 },
             },
         }
-        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
+        self.start_patchers(fake_fs)
+        result = build_matrix.build_matrix('d0_0')
+        assert len(result) == 1
 
     def test_random_dollar_sign_with_concat(self):
         fake_fs = {
@@ -237,36 +217,15 @@ class TestBuildMatrix(object):
                 },
             },
         }
-        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]
+        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]
 
     def test_random_dollar_sign_with_convolve(self):
         fake_fs = {
@@ -288,28 +247,9 @@ class TestBuildMatrix(object):
                 },
             },
         }
-        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 fsv in [fake_fs, fake_fs1]:
-            self.start_patchers(fsv)
-            result = build_matrix.build_matrix('d0_0')
-            assert len(result) == 4
+        self.start_patchers(fake_fs)
+        result = build_matrix.build_matrix('d0_0')
+        assert len(result) == 4
 
     def test_emulate_teuthology_noceph(self):
         fake_fs = {
-- 
2.39.5