summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2023-04-04 15:27:31 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-04-05 17:26:53 +0100
commit53a1ad0c88564337ac3416d00c20585107adfce2 (patch)
treedc68462314fe9981fcaf5dc3077d0a79b23792a4
parentbb1cd7e0caffb8746751593f6cfa564ec6f45425 (diff)
downloadpoky-53a1ad0c88564337ac3416d00c20585107adfce2.tar.gz
oeqa/selftest/bblogging: uncomment python stdout checks
Since bitbake commit 81a58647b2f4fc0a2589b2978fc9d81b2bfe6aec [bitbake: build: Make python output print to stdout when running with -v (verbose)] we no longer need to comment out the python stdout checks. (From OE-Core rev: 67886a8473c511c8ab3db2e4587cc5a070979d11) Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/bblogging.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/meta/lib/oeqa/selftest/cases/bblogging.py b/meta/lib/oeqa/selftest/cases/bblogging.py
index 1534a36a85..040c6db089 100644
--- a/meta/lib/oeqa/selftest/cases/bblogging.py
+++ b/meta/lib/oeqa/selftest/cases/bblogging.py
@@ -105,16 +105,14 @@ class BitBakeLogging(OESelftestTestCase):
105 self.write_config('BBINCLUDELOGS = ""') 105 self.write_config('BBINCLUDELOGS = ""')
106 result = bitbake("logging-test -c pythontest_exit -f -v", ignore_status = True) 106 result = bitbake("logging-test -c pythontest_exit -f -v", ignore_status = True)
107 self.assertIn("ERROR: Logfile of failure stored in:", result.output) 107 self.assertIn("ERROR: Logfile of failure stored in:", result.output)
108 # python tasks don't log output with -v currently 108 self.assertCount(result.output, "This is python stdout", 1)
109 #self.assertCount(result.output, "This is python stdout", 1)
110 109
111 def test_python_exit_loggingD(self): 110 def test_python_exit_loggingD(self):
112 # logs, verbose 111 # logs, verbose
113 self.write_config('BBINCLUDELOGS = "yes"') 112 self.write_config('BBINCLUDELOGS = "yes"')
114 result = bitbake("logging-test -c pythontest_exit -f -v", ignore_status = True) 113 result = bitbake("logging-test -c pythontest_exit -f -v", ignore_status = True)
115 self.assertIn("ERROR: Logfile of failure stored in:", result.output) 114 self.assertIn("ERROR: Logfile of failure stored in:", result.output)
116 # python tasks don't log output with -v currently 115 self.assertCount(result.output, "This is python stdout", 1)
117 #self.assertCount(result.output, "This is python stdout", 1)
118 116
119 def test_python_exec_func_python_loggingA(self): 117 def test_python_exec_func_python_loggingA(self):
120 # no logs, no verbose 118 # no logs, no verbose
@@ -139,8 +137,7 @@ class BitBakeLogging(OESelftestTestCase):
139 result = bitbake("logging-test -c pythontest_exec_func_python -f -v", 137 result = bitbake("logging-test -c pythontest_exec_func_python -f -v",
140 ignore_status = True) 138 ignore_status = True)
141 self.assertIn("ERROR: Logfile of failure stored in:", result.output) 139 self.assertIn("ERROR: Logfile of failure stored in:", result.output)
142 # python tasks don't log output with -v currently 140 self.assertCount(result.output, "This is python stdout", 1)
143 #self.assertCount(result.output, "This is python stdout", 1)
144 141
145 def test_python_exec_func_python_loggingD(self): 142 def test_python_exec_func_python_loggingD(self):
146 # logs, verbose 143 # logs, verbose
@@ -148,8 +145,7 @@ class BitBakeLogging(OESelftestTestCase):
148 result = bitbake("logging-test -c pythontest_exec_func_python -f -v", 145 result = bitbake("logging-test -c pythontest_exec_func_python -f -v",
149 ignore_status = True) 146 ignore_status = True)
150 self.assertIn("ERROR: Logfile of failure stored in:", result.output) 147 self.assertIn("ERROR: Logfile of failure stored in:", result.output)
151 # python tasks don't log output with -v currently 148 self.assertCount(result.output, "This is python stdout", 1)
152 #self.assertCount(result.output, "This is python stdout", 1)
153 149
154 def test_python_fatal_loggingA(self): 150 def test_python_fatal_loggingA(self):
155 # no logs, no verbose 151 # no logs, no verbose
@@ -173,8 +169,7 @@ class BitBakeLogging(OESelftestTestCase):
173 self.write_config('BBINCLUDELOGS = ""') 169 self.write_config('BBINCLUDELOGS = ""')
174 result = bitbake("logging-test -c pythontest_fatal -f -v", ignore_status = True) 170 result = bitbake("logging-test -c pythontest_fatal -f -v", ignore_status = True)
175 self.assertIn("ERROR: Logfile of failure stored in:", result.output) 171 self.assertIn("ERROR: Logfile of failure stored in:", result.output)
176 # python tasks don't log output with -v currently 172 self.assertCount(result.output, "This is python fatal test stdout", 1)
177 #self.assertCount(result.output, "This is python fatal test stdout", 1)
178 self.assertCount(result.output, "This is a fatal error", 1) 173 self.assertCount(result.output, "This is a fatal error", 1)
179 174
180 def test_python_fatal_loggingD(self): 175 def test_python_fatal_loggingD(self):
@@ -182,7 +177,6 @@ class BitBakeLogging(OESelftestTestCase):
182 self.write_config('BBINCLUDELOGS = "yes"') 177 self.write_config('BBINCLUDELOGS = "yes"')
183 result = bitbake("logging-test -c pythontest_fatal -f -v", ignore_status = True) 178 result = bitbake("logging-test -c pythontest_fatal -f -v", ignore_status = True)
184 self.assertIn("ERROR: Logfile of failure stored in:", result.output) 179 self.assertIn("ERROR: Logfile of failure stored in:", result.output)
185 # python tasks don't log output with -v currently 180 self.assertCount(result.output, "This is python fatal test stdout", 1)
186 #self.assertCount(result.output, "This is python fatal test stdout", 1)
187 self.assertCount(result.output, "This is a fatal error", 1) 181 self.assertCount(result.output, "This is a fatal error", 1)
188 182