Skip to content

Commit 2c57018

Browse files
furtibfurtib
committed
Add stderr as message for process asserts
1 parent 9b4fd11 commit 2c57018

10 files changed

Lines changed: 67 additions & 67 deletions

File tree

‎test/foss/test_foss.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ def test_runner(self) -> None:
7171
if not os.path.exists(project_working_dir):
7272
ret, _, _ = self.run_command("sh init.sh", project_root)
7373
self.assertTrue(os.path.exists(project_working_dir))
74-
ret, _, _ = self.run_command(
74+
ret, _, stderr = self.run_command(
7575
"bazel build :codechecker_test", project_working_dir
7676
)
77-
self.assertEqual(ret, 0)
78-
ret, _, _ = self.run_command(
77+
self.assertEqual(ret, 0, stderr)
78+
ret, _, stderr = self.run_command(
7979
"bazel build :per_file_test", project_working_dir
8080
)
81-
self.assertEqual(ret, 0)
81+
self.assertEqual(ret, 0, stderr)
8282

8383
return test_runner
8484

‎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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ def test_bazel_test_codechecker_caching(self):
7272
the monolithic rule, as expected from architectural constrains.
7373
"""
7474
target = "//test/unit/caching/tmp:codechecker_caching"
75-
ret, _, _ = self.run_command(f"bazel build {target}")
76-
self.assertEqual(ret, 0)
75+
ret, _, stderr = self.run_command(f"bazel build {target}")
76+
self.assertEqual(ret, 0, stderr)
7777
try:
7878
with open("tmp/secondary.cc", "a", encoding="utf-8") as f:
7979
f.write("//test")
8080
except FileNotFoundError:
8181
self.fail("File not found!")
8282
ret, _, stderr = self.run_command(f"bazel build {target} --subcommands")
83-
self.assertEqual(ret, 0)
83+
self.assertEqual(ret, 0, stderr)
8484
# Since everything in the monolithic rule is a single action,
8585
# we expect that action to rerun for any modified file.
8686
self.assertEqual(
@@ -93,15 +93,15 @@ def test_bazel_test_per_file_caching(self):
9393
results for unchanged input files.
9494
"""
9595
target = "//test/unit/caching/tmp:per_file_caching"
96-
ret, _, _ = self.run_command(f"bazel build {target}")
97-
self.assertEqual(ret, 0)
96+
ret, _, stderr = self.run_command(f"bazel build {target}")
97+
self.assertEqual(ret, 0, stderr)
9898
try:
9999
with open("tmp/secondary.cc", "a", encoding="utf-8") as f:
100100
f.write("//test")
101101
except FileNotFoundError:
102102
self.fail("File not found!")
103103
ret, _, stderr = self.run_command(f"bazel build {target} --subcommands")
104-
self.assertEqual(ret, 0)
104+
self.assertEqual(ret, 0, stderr)
105105
self.assertEqual(
106106
stderr.count(f"SUBCOMMAND: # {target} [action 'CodeChecker"), 1
107107
)
@@ -112,15 +112,15 @@ def test_bazel_test_per_file_ctu_caching(self):
112112
the whole project when CTU is enabled
113113
"""
114114
target = "//test/unit/caching/tmp:per_file_caching_ctu"
115-
ret, _, _ = self.run_command(f"bazel build {target}")
116-
self.assertEqual(ret, 0)
115+
ret, _, stderr = self.run_command(f"bazel build {target}")
116+
self.assertEqual(ret, 0, stderr)
117117
try:
118118
with open("tmp/secondary.cc", "a", encoding="utf-8") as f:
119119
f.write("//test")
120120
except FileNotFoundError:
121121
self.fail("File not found!")
122122
ret, _, stderr = self.run_command(f"bazel build {target} --subcommands")
123-
self.assertEqual(ret, 0)
123+
self.assertEqual(ret, 0, stderr)
124124
# We expect both files to be reanalyzed, since there is no caching
125125
# implemented for CTU analysis
126126
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, # pyright: ignore
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, # pyright: ignore
8787
"per_file_filter",

‎test/unit/config/test_config.py‎

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

3535
def test_codechecker_json(self):
3636
"""Test: bazel build //test/unit/config:codechecker_json"""
37-
ret, _, _ = self.run_command(
37+
ret, _, stderr = self.run_command(
3838
"bazel build //test/unit/config:codechecker_json"
3939
)
40-
self.assertEqual(ret, 0)
40+
self.assertEqual(ret, 0, stderr)
4141
copied_config = os.path.join(
4242
self.BAZEL_BIN_DIR, # type: ignore
4343
"codechecker_json",
@@ -47,10 +47,10 @@ def test_codechecker_json(self):
4747

4848
def test_codechecker_yaml(self):
4949
"""Test: bazel build //test/unit/config:codechecker_yaml"""
50-
ret, _, _ = self.run_command(
50+
ret, _, stderr = self.run_command(
5151
"bazel build //test/unit/config:codechecker_yaml"
5252
)
53-
self.assertEqual(ret, 0)
53+
self.assertEqual(ret, 0, stderr)
5454
copied_config = os.path.join(
5555
self.BAZEL_BIN_DIR, # type: ignore
5656
"codechecker_yaml",
@@ -60,11 +60,11 @@ def test_codechecker_yaml(self):
6060

6161
def test_codechecker_test_json(self):
6262
"""Test: bazel test //test/unit/config:codechecker_test_json"""
63-
ret, _, _ = self.run_command(
63+
ret, _, stderr = self.run_command(
6464
"bazel test //test/unit/config:codechecker_test_json"
6565
)
6666
# Should not find the division by zero bug
67-
self.assertEqual(ret, 0)
67+
self.assertEqual(ret, 0, stderr)
6868
copied_config = os.path.join(
6969
self.BAZEL_BIN_DIR, # type: ignore
7070
"codechecker_test_json",
@@ -76,11 +76,11 @@ def test_codechecker_test_json(self):
7676

7777
def test_codechecker_test_yaml(self):
7878
"""Test: bazel test //test/unit/config:codechecker_test_yaml"""
79-
ret, _, _ = self.run_command(
79+
ret, _, stderr = self.run_command(
8080
"bazel test //test/unit/config:codechecker_test_yaml"
8181
)
8282
# Should not find the division by zero bug
83-
self.assertEqual(ret, 0)
83+
self.assertEqual(ret, 0, stderr)
8484
copied_config = os.path.join(
8585
self.BAZEL_BIN_DIR, # type: ignore
8686
"codechecker_test_yaml",
@@ -90,11 +90,11 @@ def test_codechecker_test_yaml(self):
9090

9191
def test_per_file_test_json(self):
9292
"""Test: bazel test //test/unit/config:per_file_test_json"""
93-
ret, _, _ = self.run_command(
93+
ret, _, stderr = self.run_command(
9494
"bazel test //test/unit/config:per_file_test_json"
9595
)
9696
# Should not find the division by zero bug
97-
self.assertEqual(ret, 0)
97+
self.assertEqual(ret, 0, stderr)
9898
copied_config = os.path.join(
9999
self.BAZEL_BIN_DIR, # type: ignore
100100
"per_file_test_json",
@@ -104,11 +104,11 @@ def test_per_file_test_json(self):
104104

105105
def test_per_file_test_yaml(self):
106106
"""Test: bazel test //test/unit/config:per_file_test_yaml"""
107-
ret, _, _ = self.run_command(
107+
ret, _, stderr = self.run_command(
108108
"bazel test //test/unit/config:per_file_test_yaml"
109109
)
110110
# Should not find the division by zero bug
111-
self.assertEqual(ret, 0)
111+
self.assertEqual(ret, 0, stderr)
112112
copied_config = os.path.join(
113113
self.BAZEL_BIN_DIR, # type: ignore
114114
"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
@@ -86,11 +86,11 @@ def test_compile_commands_external_lib(self):
8686
Test: bazel build :compile_commands_isystem "
8787
"--experimental_cc_implementation_deps --enable_bzlmod
8888
"""
89-
ret, _, _ = self.run_command(
89+
ret, _, stderr = self.run_command(
9090
"bazel build :compile_commands_isystem "
9191
"--experimental_cc_implementation_deps --enable_bzlmod"
9292
)
93-
self.assertEqual(ret, 0)
93+
self.assertEqual(ret, 0, stderr)
9494
comp_json_file = os.path.join(
9595
self.BAZEL_BIN_DIR, # pyright: ignore
9696
"compile_commands_isystem",
@@ -119,20 +119,20 @@ def test_codechecker_external_lib(self):
119119
Test: bazel build :codechecker_external_deps
120120
--experimental_cc_implementation_deps --enable_bzlmod
121121
"""
122-
ret, _, _ = self.run_command(
122+
ret, _, stderr = self.run_command(
123123
"bazel build :codechecker_external_deps "
124124
"--experimental_cc_implementation_deps --enable_bzlmod"
125125
)
126-
self.assertEqual(ret, 0)
126+
self.assertEqual(ret, 0, stderr)
127127

128128
def test_per_file_external_lib(self):
129129
"""Test: bazel build :per_file_external_deps "
130130
"--experimental_cc_implementation_deps"""
131-
ret, _, _ = self.run_command(
131+
ret, _, stderr = self.run_command(
132132
"bazel build :per_file_external_deps "
133133
"--experimental_cc_implementation_deps --enable_bzlmod"
134134
)
135-
self.assertEqual(ret, 0)
135+
self.assertEqual(ret, 0, stderr)
136136

137137

138138
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
@@ -35,10 +35,10 @@ def test_genrule_header_codechecker(self):
3535
"""
3636
Test: bazel test //test/unit/generated_files:codechecker_genrule_header
3737
"""
38-
ret, _, _ = self.run_command(
38+
ret, _, stderr = self.run_command(
3939
"bazel test //test/unit/generated_files:codechecker_genrule_header"
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_genrule_header",
@@ -55,10 +55,10 @@ def test_genrule_source_codechecker(self):
5555
"""
5656
Test: bazel test //test/unit/generated_files:codechecker_genrule_source
5757
"""
58-
ret, _, _ = self.run_command(
58+
ret, _, stderr = self.run_command(
5959
"bazel test //test/unit/generated_files:codechecker_genrule_source"
6060
)
61-
self.assertEqual(ret, 3)
61+
self.assertEqual(ret, 3, stderr)
6262
test_log = os.path.join(
6363
self.BAZEL_TESTLOGS_DIR, # type: ignore
6464
"codechecker_genrule_source",
@@ -75,10 +75,10 @@ def test_genrule_header_per_file(self):
7575
"""
7676
Test: bazel test //test/unit/generated_files:per_file_genrule_header
7777
"""
78-
ret, _, _ = self.run_command(
78+
ret, _, stderr = self.run_command(
7979
"bazel test //test/unit/generated_files:per_file_genrule_header"
8080
)
81-
self.assertEqual(ret, 3)
81+
self.assertEqual(ret, 3, stderr)
8282
test_log = os.path.join(
8383
self.BAZEL_TESTLOGS_DIR, # type: ignore
8484
"per_file_genrule_header",
@@ -95,10 +95,10 @@ def test_genrule_source_per_file(self):
9595
"""
9696
Test: bazel test //test/unit/generated_files:per_file_genrule_source
9797
"""
98-
ret, _, _ = self.run_command(
98+
ret, _, stderr = self.run_command(
9999
"bazel test //test/unit/generated_files:per_file_genrule_source"
100100
)
101-
self.assertEqual(ret, 3)
101+
self.assertEqual(ret, 3, stderr)
102102
test_log = os.path.join(
103103
self.BAZEL_TESTLOGS_DIR, # type: ignore
104104
"per_file_genrule_source",
@@ -117,11 +117,11 @@ def test_genrule_source_compile_commands(self):
117117
bazel build //test/unit/generated_files:compile_commands_genrule_source
118118
"""
119119
target = "genrule_source"
120-
ret, _, _ = self.run_command(
120+
ret, _, stderr = self.run_command(
121121
"bazel build "
122122
+ f"//test/unit/generated_files:compile_commands_{target}"
123123
)
124-
self.assertEqual(ret, 0)
124+
self.assertEqual(ret, 0, stderr)
125125
compile_commands = os.path.join(
126126
self.BAZEL_BIN_DIR, # type: ignore
127127
f"compile_commands_{target}",
@@ -140,11 +140,11 @@ def test_genrule_header_compile_commands(self):
140140
bazel build //test/unit/generated_files:compile_commands_genrule_header
141141
"""
142142
target = "genrule_header"
143-
ret, _, _ = self.run_command(
143+
ret, _, stderr = self.run_command(
144144
"bazel build "
145145
f"//test/unit/generated_files:compile_commands_{target}"
146146
)
147-
self.assertEqual(ret, 0)
147+
self.assertEqual(ret, 0, stderr)
148148
compile_commands = os.path.join(
149149
self.BAZEL_BIN_DIR, # type: ignore
150150
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
@@ -37,11 +37,11 @@ def test_codechecker_implementation_deps(self):
3737
Test: bazel test --experimental_cc_implementation_deps
3838
//test/unit/implementation_deps:codechecker_implementation_deps
3939
"""
40-
ret, _, _ = self.run_command(
40+
ret, _, stderr = self.run_command(
4141
"bazel test --experimental_cc_implementation_deps "
4242
"//test/unit/implementation_deps:codechecker_implementation_deps"
4343
)
44-
self.assertEqual(ret, 3)
44+
self.assertEqual(ret, 3, stderr)
4545
test_log = os.path.join(
4646
self.BAZEL_TESTLOGS_DIR, # type: ignore
4747
"codechecker_implementation_deps",
@@ -59,11 +59,11 @@ def test_per_file_implementation_deps(self):
5959
Test: bazel test --experimental_cc_implementation_deps
6060
//test/unit/implementation_deps:pre_file_implementation_deps
6161
"""
62-
ret, _, _ = self.run_command(
62+
ret, _, stderr = self.run_command(
6363
"bazel test --experimental_cc_implementation_deps "
6464
"//test/unit/implementation_deps:per_file_implementation_deps"
6565
)
66-
self.assertEqual(ret, 3)
66+
self.assertEqual(ret, 3, stderr)
6767
test_log = os.path.join(
6868
self.BAZEL_TESTLOGS_DIR, # type: ignore
6969
"per_file_implementation_deps",
@@ -81,11 +81,11 @@ def test_compile_commands_implementation_deps(self):
8181
Test: bazel build --experimental_cc_implementation_deps
8282
//test/unit/implementation_deps:compile_commands_implementation_deps
8383
"""
84-
ret, _, _ = self.run_command(
84+
ret, _, stderr = self.run_command(
8585
"bazel build --experimental_cc_implementation_deps //test/unit/"
8686
"implementation_deps:compile_commands_implementation_deps"
8787
)
88-
self.assertEqual(ret, 0)
88+
self.assertEqual(ret, 0, stderr)
8989
compile_commands = os.path.join(
9090
self.BAZEL_BIN_DIR, # type: ignore
9191
"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,11 +64,11 @@ 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 "
6969
"--experimental_writable_outputs"
7070
)
71-
self.assertEqual(ret, 0)
71+
self.assertEqual(ret, 0, stderr)
7272
self.check_store(
7373
f"{self.BAZEL_BIN_DIR}/codechecker/codechecker-files/data",
7474
"unit_test_bazel",

0 commit comments

Comments
 (0)