Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 04d8b06

Browse files
my_chattr: improved test unit
1 parent 20e556b commit 04d8b06

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

‎15_File_Attributes/run_test_chattr.sh‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ fi
8080
# Do a test for each file system
8181
# ------------------------------------------------------------------------------
8282

83-
cp /dev/null base_results.dat
84-
cp /dev/null mine_results.dat
83+
mkdir -p base_results mine_results
8584

8685
exec 3<"${parm_file}"
8786
while read -u3 mode
@@ -91,23 +90,17 @@ do
9190
case "${fs_file}" in
9291
*base*)
9392
chattr "${mode}" "${fs_file}"
93+
result_file=$(echo "${fs_file}" | sed -re 's!.*/([^/]+)_base/target!1円!')"${mode}"
9494
printf '%s: %s %s\n' "${mode}" $(lsattr "${fs_file}") | \
95-
sed -re 's/_base//' \
96-
-e 's/^\+/ADD_/' \
97-
-e 's/^\=/SET_/' \
98-
-e 's/^\-/DEL_/' \
99-
-e 's!(.*:) (.*) .*/(.*)/target!3円_1円 2円!' \
100-
>>base_results.dat
95+
sed -re 's!.*: (.*) .*/target!1円!' \
96+
>"base_results/${result_file}"
10197
;;
10298
*mine*)
10399
./my_chattr "${mode}" "${fs_file}"
100+
result_file=$(echo "${fs_file}" | sed -re 's!.*/([^/]+)_mine/target!1円!')"${mode}"
104101
printf '%s: %s %s\n' "${mode}" $(lsattr "${fs_file}") | \
105-
sed -re 's/_mine//' \
106-
-e 's/^\+/ADD_/' \
107-
-e 's/^\=/SET_/' \
108-
-e 's/^\-/DEL_/' \
109-
-e 's!(.*:) (.*) .*/(.*)/target!3円_1円 2円!' \
110-
>>mine_results.dat
102+
sed -re 's!.*: (.*) .*/target!1円!' \
103+
>"mine_results/${result_file}"
111104
;;
112105
*) printf '%s: invalid file name (%s)\n' "0ドル" "${fs_file}" >&2
113106
;;
@@ -119,8 +112,6 @@ done
119112
# Compare results
120113
# ------------------------------------------------------------------------------
121114

122-
diff \
123-
<(sort -k1 base_results.dat) \
124-
<(sort -k1 mine_results.dat)
115+
diff base_results/ mine_results/
125116

126117
popd &>/dev/null

‎15_File_Attributes/run_test_chattr.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@
5151
cmd: "{{ src_dir }}/run_test_chattr.sh"
5252
register: run_test_chattr
5353

54+
- name: "Show errors from test"
55+
ansible.builtin.debug:
56+
var: run_test_chattr.stderr_lines
57+
when:
58+
- run_test_chattr is defined
59+
- run_test_chattr.stderr_lines is defined
60+
5461
- name: "Show results of test"
5562
ansible.builtin.debug:
5663
var: run_test_chattr.stdout_lines
5764
when:
5865
- run_test_chattr is defined
66+
- run_test_chattr.stdout_lines is defined
5967
...

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /