Skip to content

Commit 801c4ee

Browse files
furtibfurtib
committed
Add stderr as message for process asserts
1 parent 0623f39 commit 801c4ee

10 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎test/foss/test_foss.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ def test_runner(self) -> None:
6262
if not os.path.exists(project_working_dir):
6363
ret, _, _ = self.run_command("sh init.sh", project_root)
6464
self.assertTrue(os.path.exists(project_working_dir))
65-
ret, _, _ = self.run_command(
65+
ret, _, stderr = self.run_command(
6666
"bazel build :codechecker_test", project_working_dir
6767
)
68-
self.assertEqual(ret, 0)
69-
ret, _, _ = self.run_command(
68+
self.assertEqual(ret, 0, stderr)
69+
ret, _, stderr = self.run_command(
7070
"bazel build :per_file_test", project_working_dir
7171
)
72-
self.assertEqual(ret, 0)
72+
self.assertEqual(ret, 0, stderr)
7373

7474
return test_runner
7575

‎test/unit/argument_merge/test_argument_merge.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class TestTemplate(TestBase):
3636

3737
def test_per_file_argument_merge(self):
3838
"""Test: Whether default options gets override"""
39-
code, _, _ = self.run_command(
39+
code, _, stderr = self.run_command(
4040
"bazel build //test/unit/argument_merge:per_file_argument_merge"
4141
)
42-
self.assertEqual(code, 0)
42+
self.assertEqual(code, 0, stderr)
4343
matched_lines: list[str] = self.grep_file(
4444
self.BAZEL_BIN_DIR
4545
+ "/per_file_argument_merge/data/"

‎test/unit/caching/test_caching.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ def test_bazel_test_codechecker_caching(self):
7171
the monolithic rule, as expected from architectural constrains.
7272
"""
7373
target = "//test/unit/caching/tmp:codechecker_caching"
74-
ret, _, _ = self.run_command(f"bazel build {target}")
75-
self.assertEqual(ret, 0)
74+
ret, _, stderr = self.run_command(f"bazel build {target}")
75+
self.assertEqual(ret, 0, stderr)
7676
try:
7777
with open("tmp/secondary.cc", "a", encoding="utf-8") as f:
7878
f.write("//test")
7979
except FileNotFoundError:
80-
self.fail(f"File not found!")
80+
self.fail("File not found!")
8181
ret, _, stderr = self.run_command(f"bazel build {target} --subcommands")
82-
self.assertEqual(ret, 0)
82+
self.assertEqual(ret, 0, stderr)
8383
# Since everything in the monolithic rule is a single action,
8484
# we expect that action to rerun for any modified file.
8585
self.assertEqual(
@@ -92,15 +92,15 @@ def test_bazel_test_per_file_caching(self):
9292
results for unchanged input files.
9393
"""
9494
target = "//test/unit/caching/tmp:per_file_caching"
95-
ret, _, _ = self.run_command(f"bazel build {target}")
96-
self.assertEqual(ret, 0)
95+
ret, _, stderr = self.run_command(f"bazel build {target}")
96+
self.assertEqual(ret, 0, stderr)
9797
try:
9898
with open("tmp/secondary.cc", "a", encoding="utf-8") as f:
9999
f.write("//test")
100100
except FileNotFoundError:
101-
self.fail(f"File not found!")
101+
self.fail("File not found!")
102102
ret, _, stderr = self.run_command(f"bazel build {target} --subcommands")
103-
self.assertEqual(ret, 0)
103+
self.assertEqual(ret, 0, stderr)
104104
self.assertEqual(
105105
stderr.count(f"SUBCOMMAND: # {target} [action 'CodeChecker"), 1
106106
)
@@ -111,15 +111,15 @@ def test_bazel_test_per_file_ctu_caching(self):
111111
the whole project when CTU is enabled
112112
"""
113113
target = "//test/unit/caching/tmp:per_file_caching_ctu"
114-
ret, _, _ = self.run_command(f"bazel build {target}")
115-
self.assertEqual(ret, 0)
114+
ret, _, stderr = self.run_command(f"bazel build {target}")
115+
self.assertEqual(ret, 0, stderr)
116116
try:
117117
with open("tmp/secondary.cc", "a", encoding="utf-8") as f:
118118
f.write("//test")
119119
except FileNotFoundError:
120120
self.fail(f"File not found!")
121121
ret, _, stderr = self.run_command(f"bazel build {target} --subcommands")
122-
self.assertEqual(ret, 0)
122+
self.assertEqual(ret, 0, stderr)
123123
# We expect both files to be reanalyzed, since there is no caching
124124
# implemented for CTU analysis
125125
self.assertEqual(

‎test/unit/compile_flags/test_compile_flags.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def test_bazel_test_compile_commands_filter(self):
4343
+ "//test/unit/compile_flags:compile_commands_filter "
4444
+ "--cxxopt=__CXX__ --conlyopt=__CONLY__"
4545
)
46-
exit_code, _, _ = self.run_command(build_cmd)
47-
self.assertEqual(0, exit_code)
46+
exit_code, _, stderr = self.run_command(build_cmd)
47+
self.assertEqual(0, exit_code, stderr)
4848
compile_commands = os.path.join(
4949
self.BAZEL_BIN_DIR,
5050
"compile_commands_filter",
@@ -80,8 +80,8 @@ def test_bazel_test_per_file_filter(self):
8080
+ "//test/unit/compile_flags:per_file_filter "
8181
+ "--cxxopt=__CXX__ --conlyopt=__CONLY__"
8282
)
83-
exit_code, _, _ = self.run_command(build_cmd)
84-
self.assertEqual(0, exit_code)
83+
exit_code, _, stderr = self.run_command(build_cmd)
84+
self.assertEqual(0, exit_code, stderr)
8585
compile_commands = os.path.join(
8686
self.BAZEL_BIN_DIR,
8787
"per_file_filter",

‎test/unit/config/test_config.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class TestConfig(TestBase):
3535

3636
def test_codechecker_json(self):
3737
"""Test: bazel build //test/unit/config:codechecker_json"""
38-
ret, _, _ = self.run_command(
38+
ret, _, stderr = self.run_command(
3939
"bazel build //test/unit/config:codechecker_json"
4040
)
41-
self.assertEqual(ret, 0)
41+
self.assertEqual(ret, 0, stderr)
4242
copied_config = os.path.join(
4343
self.BAZEL_BIN_DIR, # type: ignore
4444
"codechecker_json",
@@ -48,10 +48,10 @@ def test_codechecker_json(self):
4848

4949
def test_codechecker_yaml(self):
5050
"""Test: bazel build //test/unit/config:codechecker_yaml"""
51-
ret, _, _ = self.run_command(
51+
ret, _, stderr = self.run_command(
5252
"bazel build //test/unit/config:codechecker_yaml"
5353
)
54-
self.assertEqual(ret, 0)
54+
self.assertEqual(ret, 0, stderr)
5555
copied_config = os.path.join(
5656
self.BAZEL_BIN_DIR, # type: ignore
5757
"codechecker_yaml",
@@ -61,11 +61,11 @@ def test_codechecker_yaml(self):
6161

6262
def test_codechecker_test_json(self):
6363
"""Test: bazel test //test/unit/config:codechecker_test_json"""
64-
ret, _, _ = self.run_command(
64+
ret, _, stderr = self.run_command(
6565
"bazel test //test/unit/config:codechecker_test_json"
6666
)
6767
# Should not find the division by zero bug
68-
self.assertEqual(ret, 0)
68+
self.assertEqual(ret, 0, stderr)
6969
copied_config = os.path.join(
7070
self.BAZEL_BIN_DIR, # type: ignore
7171
"codechecker_test_json",
@@ -77,11 +77,11 @@ def test_codechecker_test_json(self):
7777

7878
def test_codechecker_test_yaml(self):
7979
"""Test: bazel test //test/unit/config:codechecker_test_yaml"""
80-
ret, _, _ = self.run_command(
80+
ret, _, stderr = self.run_command(
8181
"bazel test //test/unit/config:codechecker_test_yaml"
8282
)
8383
# Should not find the division by zero bug
84-
self.assertEqual(ret, 0)
84+
self.assertEqual(ret, 0, stderr)
8585
copied_config = os.path.join(
8686
self.BAZEL_BIN_DIR, # type: ignore
8787
"codechecker_test_yaml",
@@ -91,11 +91,11 @@ def test_codechecker_test_yaml(self):
9191

9292
def test_per_file_test_json(self):
9393
"""Test: bazel test //test/unit/config:per_file_test_json"""
94-
ret, _, _ = self.run_command(
94+
ret, _, stderr = self.run_command(
9595
"bazel test //test/unit/config:per_file_test_json"
9696
)
9797
# Should not find the division by zero bug
98-
self.assertEqual(ret, 0)
98+
self.assertEqual(ret, 0, stderr)
9999
copied_config = os.path.join(
100100
self.BAZEL_BIN_DIR, # type: ignore
101101
"per_file_test_json",
@@ -105,11 +105,11 @@ def test_per_file_test_json(self):
105105

106106
def test_per_file_test_yaml(self):
107107
"""Test: bazel test //test/unit/config:per_file_test_yaml"""
108-
ret, _, _ = self.run_command(
108+
ret, _, stderr = self.run_command(
109109
"bazel test //test/unit/config:per_file_test_yaml"
110110
)
111111
# Should not find the division by zero bug
112-
self.assertEqual(ret, 0)
112+
self.assertEqual(ret, 0, stderr)
113113
copied_config = os.path.join(
114114
self.BAZEL_BIN_DIR, # type: ignore
115115
"per_file_test_yaml",

‎test/unit/external_repository/test_external_repo.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def tearDownClass(cls):
7575

7676
def test_compile_commands_external_lib(self):
7777
"""Test: bazel build :compile_commands_isystem"""
78-
ret, _, _ = self.run_command(
78+
ret, _, stderr = self.run_command(
7979
"bazel build :compile_commands_isystem")
80-
self.assertEqual(ret, 0)
80+
self.assertEqual(ret, 0, stderr)
8181
comp_json_file = os.path.join(
8282
self.BAZEL_BIN_DIR, # pyright: ignore[reportOptionalOperand]
8383
"compile_commands_isystem",
@@ -102,15 +102,15 @@ def test_compile_commands_external_lib(self):
102102

103103
def test_codechecker_external_lib(self):
104104
"""Test: bazel build :codechecker_external_deps"""
105-
ret, _, _ = self.run_command(
105+
ret, _, stderr = self.run_command(
106106
"bazel build :codechecker_external_deps")
107-
self.assertEqual(ret, 0)
107+
self.assertEqual(ret, 0, stderr)
108108

109109
def test_per_file_external_lib(self):
110110
"""Test: bazel build :per_file_external_deps"""
111-
ret, _, _ = self.run_command(
111+
ret, _, stderr = self.run_command(
112112
"bazel build :per_file_external_deps")
113-
self.assertEqual(ret, 0)
113+
self.assertEqual(ret, 0, stderr)
114114

115115

116116
if __name__ == "__main__":

‎test/unit/generated_files/test_generated_files.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ class TestGeneratedFiles(TestBase):
3434

3535
def test_genrule_header_codechecker(self):
3636
"""Test: bazel test //test/unit/generated_files:codechecker_genrule_header"""
37-
ret, _, _ = self.run_command(
37+
ret, _, stderr = self.run_command(
3838
f"bazel test //test/unit/generated_files:codechecker_genrule_header"
3939
)
40-
self.assertEqual(ret, 3)
40+
self.assertEqual(ret, 3, stderr)
4141
test_log = os.path.join(
4242
self.BAZEL_TESTLOGS_DIR, # type: ignore
4343
"codechecker_genrule_header",
@@ -52,10 +52,10 @@ def test_genrule_header_codechecker(self):
5252

5353
def test_genrule_source_codechecker(self):
5454
"""Test: bazel test //test/unit/generated_files:codechecker_genrule_source"""
55-
ret, _, _ = self.run_command(
55+
ret, _, stderr = self.run_command(
5656
f"bazel test //test/unit/generated_files:codechecker_genrule_source"
5757
)
58-
self.assertEqual(ret, 3)
58+
self.assertEqual(ret, 3, stderr)
5959
test_log = os.path.join(
6060
self.BAZEL_TESTLOGS_DIR, # type: ignore
6161
"codechecker_genrule_source",
@@ -70,10 +70,10 @@ def test_genrule_source_codechecker(self):
7070

7171
def test_genrule_header_per_file(self):
7272
"""Test: bazel test //test/unit/generated_files:per_file_genrule_header"""
73-
ret, _, _ = self.run_command(
73+
ret, _, stderr = self.run_command(
7474
f"bazel test //test/unit/generated_files:per_file_genrule_header"
7575
)
76-
self.assertEqual(ret, 3)
76+
self.assertEqual(ret, 3, stderr)
7777
test_log = os.path.join(
7878
self.BAZEL_TESTLOGS_DIR, # type: ignore
7979
"per_file_genrule_header",
@@ -88,10 +88,10 @@ def test_genrule_header_per_file(self):
8888

8989
def test_genrule_source_per_file(self):
9090
"""Test: bazel test //test/unit/generated_files:per_file_genrule_source"""
91-
ret, _, _ = self.run_command(
91+
ret, _, stderr = self.run_command(
9292
f"bazel test //test/unit/generated_files:per_file_genrule_source"
9393
)
94-
self.assertEqual(ret, 3)
94+
self.assertEqual(ret, 3, stderr)
9595
test_log = os.path.join(
9696
self.BAZEL_TESTLOGS_DIR, # type: ignore
9797
"per_file_genrule_source",
@@ -110,11 +110,11 @@ def test_genrule_source_compile_commands(self):
110110
bazel build //test/unit/generated_files:compile_commands_genrule_source
111111
"""
112112
target = "genrule_source"
113-
ret, _, _ = self.run_command(
113+
ret, _, stderr = self.run_command(
114114
"bazel build " +
115115
f"//test/unit/generated_files:compile_commands_{target}"
116116
)
117-
self.assertEqual(ret, 0)
117+
self.assertEqual(ret, 0, stderr)
118118
compile_commands = os.path.join(
119119
self.BAZEL_BIN_DIR, # type: ignore
120120
f"compile_commands_{target}",
@@ -133,11 +133,11 @@ def test_genrule_header_compile_commands(self):
133133
bazel build //test/unit/generated_files:compile_commands_genrule_header
134134
"""
135135
target = "genrule_header"
136-
ret, _, _ = self.run_command(
136+
ret, _, stderr = self.run_command(
137137
"bazel build " +
138138
f"//test/unit/generated_files:compile_commands_{target}"
139139
)
140-
self.assertEqual(ret, 0)
140+
self.assertEqual(ret, 0, stderr)
141141
compile_commands = os.path.join(
142142
self.BAZEL_BIN_DIR, # type: ignore
143143
f"compile_commands_{target}",

‎test/unit/implementation_deps/test_implementation_deps.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class TestImplementationDeps(TestBase):
3535

3636
def test_codechecker_implementation_deps(self):
3737
"""Test: bazel test //test/unit/implementation_deps:codechecker_implementation_deps"""
38-
ret, _, _ = self.run_command(
38+
ret, _, stderr = self.run_command(
3939
"bazel test --experimental_cc_implementation_deps //test/unit/implementation_deps:codechecker_implementation_deps"
4040
)
41-
self.assertEqual(ret, 3)
41+
self.assertEqual(ret, 3, stderr)
4242
test_log = os.path.join(
4343
self.BAZEL_TESTLOGS_DIR, # type: ignore
4444
"codechecker_implementation_deps",
@@ -51,10 +51,10 @@ def test_codechecker_implementation_deps(self):
5151

5252
def test_per_file_implementation_deps(self):
5353
"""Test: bazel test //test/unit/implementation_deps:pre_file_implementation_deps"""
54-
ret, _, _ = self.run_command(
54+
ret, _, stderr = self.run_command(
5555
"bazel test --experimental_cc_implementation_deps //test/unit/implementation_deps:per_file_implementation_deps"
5656
)
57-
self.assertEqual(ret, 3)
57+
self.assertEqual(ret, 3, stderr)
5858
test_log = os.path.join(
5959
self.BAZEL_TESTLOGS_DIR, # type: ignore
6060
"per_file_implementation_deps",
@@ -67,10 +67,10 @@ def test_per_file_implementation_deps(self):
6767

6868
def test_compile_commands_implementation_deps(self):
6969
"""Test: bazel build //test/unit/implementation_deps:compile_commands_implementation_deps"""
70-
ret, _, _ = self.run_command(
70+
ret, _, stderr = self.run_command(
7171
"bazel build --experimental_cc_implementation_deps //test/unit/implementation_deps:compile_commands_implementation_deps"
7272
)
73-
self.assertEqual(ret, 0)
73+
self.assertEqual(ret, 0, stderr)
7474
compile_commands = os.path.join(
7575
self.BAZEL_BIN_DIR, # type: ignore
7676
"compile_commands_implementation_deps",

‎test/unit/parse/test_parse.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ def tearDownClass(cls):
5050

5151
def test_parse_html(self):
5252
"""Test: Parse results into html"""
53-
ret, _, _ = self.run_command(
53+
ret, _, stderr = self.run_command(
5454
"bazel build //test/unit/parse:codechecker"
5555
)
56-
self.assertEqual(ret, 0)
56+
self.assertEqual(ret, 0, stderr)
5757
self.check_parse(
5858
f"{self.BAZEL_BIN_DIR}/codechecker/codechecker-files/data"
5959
)
@@ -64,10 +64,10 @@ def test_store(self):
6464
# the report folder. Bazel's output folder however is readonly.
6565
# Adding the flag: "--experimental_writable_outputs"
6666
# makes the directory writeable
67-
ret, _, _ = self.run_command(
67+
ret, _, stderr = self.run_command(
6868
"bazel build //test/unit/parse:codechecker --experimental_writable_outputs"
6969
)
70-
self.assertEqual(ret, 0)
70+
self.assertEqual(ret, 0, stderr)
7171
self.check_store(
7272
f"{self.BAZEL_BIN_DIR}/codechecker/codechecker-files/data",
7373
"unit_test_bazel",

0 commit comments

Comments
 (0)