From 3cd107cc0af30beba8cbed14772e8e3032037711 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 28 Nov 2016 07:44:54 -0500 Subject: [PATCH 1/2] Fix flaky condition in pep8 noisy report test. --- pavelib/paver_tests/test_paver_get_quality_reports.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pavelib/paver_tests/test_paver_get_quality_reports.py b/pavelib/paver_tests/test_paver_get_quality_reports.py index 1b9f7e83a1..9593c8128a 100644 --- a/pavelib/paver_tests/test_paver_get_quality_reports.py +++ b/pavelib/paver_tests/test_paver_get_quality_reports.py @@ -34,7 +34,7 @@ class TestGetReportFiles(unittest.TestCase): def test_get_pep8_reports_noisy(self, my_mock): """ Several conditions: different report types, different files, multiple files """ my_mock.return_value = iter([ - ('/foo', ('',), ('pep8.report',)), + ('/foo', (None,), ('pep8.report',)), ('/fooz', ('/ball',), ('pylint.report',)), ('/fooz', ('/ball',), ('non.report',)), ('/fooz', ('/ball',), ('lms.xml',)), From 0faa445990b191e84c77bb687a849ad960803476 Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Mon, 28 Nov 2016 17:17:20 -0500 Subject: [PATCH 2/2] Use proper pattern on entire class. --- pavelib/paver_tests/test_paver_get_quality_reports.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pavelib/paver_tests/test_paver_get_quality_reports.py b/pavelib/paver_tests/test_paver_get_quality_reports.py index 9593c8128a..cf9f1caa3f 100644 --- a/pavelib/paver_tests/test_paver_get_quality_reports.py +++ b/pavelib/paver_tests/test_paver_get_quality_reports.py @@ -15,7 +15,7 @@ class TestGetReportFiles(unittest.TestCase): def test_get_pylint_reports(self, my_mock): my_mock.return_value = iter([ - ('/foo', ('',), ('pylint.report',)), + ('/foo', (None,), ('pylint.report',)), ('/bar', ('/baz',), ('pylint.report',)) ]) reports = pavelib.quality.get_violations_reports("pylint") @@ -24,7 +24,7 @@ class TestGetReportFiles(unittest.TestCase): @patch('os.walk') def test_get_pep8_reports(self, my_mock): my_mock.return_value = iter([ - ('/foo', ('',), ('pep8.report',)), + ('/foo', (None,), ('pep8.report',)), ('/bar', ('/baz',), ('pep8.report',)) ]) reports = pavelib.quality.get_violations_reports("pep8")