summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Laplante <chris.laplante@agilent.com>2020-07-31 11:42:49 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-08 09:19:34 +0100
commit1752a4766443388a8cf372d2c5eddfe2ef1fe899 (patch)
treea3393b9e16722c2eb5e5ac4521bd1c5e6815ed38
parent5a80602564539cf0fdbabde8095969efa6077045 (diff)
downloadpoky-1752a4766443388a8cf372d2c5eddfe2ef1fe899.tar.gz
bitbake: tests/color: add test suite for ANSI color code filtering
Includes tests for bb.progress integration. (Bitbake rev: c472a8da521cc7f1d61ac2f28596167d47ab8a5a) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake-selftest1
-rw-r--r--bitbake/lib/bb/tests/color.py95
2 files changed, 96 insertions, 0 deletions
diff --git a/bitbake/bin/bitbake-selftest b/bitbake/bin/bitbake-selftest
index 041a2719f0..e84d6a559f 100755
--- a/bitbake/bin/bitbake-selftest
+++ b/bitbake/bin/bitbake-selftest
@@ -18,6 +18,7 @@ except RuntimeError as exc:
18 sys.exit(str(exc)) 18 sys.exit(str(exc))
19 19
20tests = ["bb.tests.codeparser", 20tests = ["bb.tests.codeparser",
21 "bb.tests.color",
21 "bb.tests.cooker", 22 "bb.tests.cooker",
22 "bb.tests.cow", 23 "bb.tests.cow",
23 "bb.tests.data", 24 "bb.tests.data",
diff --git a/bitbake/lib/bb/tests/color.py b/bitbake/lib/bb/tests/color.py
new file mode 100644
index 0000000000..bf03750c69
--- /dev/null
+++ b/bitbake/lib/bb/tests/color.py
@@ -0,0 +1,95 @@
1#
2# BitBake Test for ANSI color code filtering
3#
4# Copyright (C) 2020 Agilent Technologies, Inc.
5# Author: Chris Laplante <chris.laplante@agilent.com>
6#
7# SPDX-License-Identifier: MIT
8#
9
10import unittest
11import bb.progress
12import bb.data
13import bb.event
14from bb.progress import filter_color, filter_color_n
15import io
16import re
17
18
19class ProgressWatcher:
20 def __init__(self):
21 self._reports = []
22
23 def handle_event(self, event):
24 self._reports.append((event.progress, event.rate))
25
26 def reports(self):
27 return self._reports
28
29
30class ColorCodeTests(unittest.TestCase):
31 def setUp(self):
32 self.d = bb.data.init()
33 self._progress_watcher = ProgressWatcher()
34 bb.event.register("bb.build.TaskProgress", self._progress_watcher.handle_event)
35
36 def tearDown(self):
37 bb.event.remove("bb.build.TaskProgress", None)
38
39 def test_filter_color(self):
40 input_string = "~~~~~~~~~~~~^~~~~~~~"
41 filtered = filter_color(input_string)
42 self.assertEqual(filtered, "~~~~~~~~~~~~^~~~~~~~")
43
44 def test_filter_color_n(self):
45 input_string = "~~~~~~~~~~~~^~~~~~~~"
46 filtered, code_count = filter_color_n(input_string)
47 self.assertEqual(filtered, "~~~~~~~~~~~~^~~~~~~~")
48 self.assertEqual(code_count, 4)
49
50 def test_LineFilterProgressHandler_color_filtering(self):
51 class CustomProgressHandler(bb.progress.LineFilterProgressHandler):
52 PROGRESS_REGEX = re.compile(r"Progress: (?P<progress>\d+)%")
53
54 def writeline(self, line):
55 match = self.PROGRESS_REGEX.match(line)
56 if match:
57 self.update(int(match.group("progress")))
58 return False
59 return True
60
61 buffer = io.StringIO()
62 handler = CustomProgressHandler(self.d, buffer)
63 handler.write("Program output!\n")
64 handler.write("More output!\n")
65 handler.write("Progress: 10%\n") # 10%
66 handler.write("Even more\n")
67 handler.write("Progress: 50%\n") # 50%
68 handler.write("Progress: 60%\n") # 60%
69 handler.write("Progress: 100%\n") # 100%
70
71 expected = [(10, None), (50, None), (60, None), (100, None)]
72 self.assertEqual(self._progress_watcher.reports(), expected)
73
74 self.assertEqual(buffer.getvalue(), "Program output!\nMore output!\nEven more\n")
75
76 def test_BasicProgressHandler_color_filtering(self):
77 buffer = io.StringIO()
78 handler = bb.progress.BasicProgressHandler(self.d, outfile=buffer)
79 handler.write("1%\n") # 1%
80 handler.write("2%\n") # 2%
81 handler.write("10%\n") # 10%
82 handler.write("100%\n") # 100%
83
84 expected = [(0, None), (1, None), (2, None), (10, None), (100, None)]
85 self.assertListEqual(self._progress_watcher.reports(), expected)
86
87 def test_OutOfProgressHandler_color_filtering(self):
88 buffer = io.StringIO()
89 handler = bb.progress.OutOfProgressHandler(self.d, r'(\d+) of (\d+)', outfile=buffer)
90 handler.write("Text text 1 of 5") # 1/5
91 handler.write("Text text 3 of 5") # 3/5
92 handler.write("Text text 5 of 5") # 5/5
93
94 expected = [(0, None), (20.0, None), (60.0, None), (100.0, None)]
95 self.assertListEqual(self._progress_watcher.reports(), expected)