Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/reorder-shiffs-hung-test into ~canonical-kernel-team/+git/autotest-client-tests:master

Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 260d5ef6ffaa6f5a5c91762c545e570078b7c199
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/reorder-shiffs-hung-test
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 16 lines (+5/-0)
1 file modified
ubuntu_overlayfs_smoke_test/control (+5/-0)
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+448352@code.launchpad.net

Commit message

This test is a dangerous test, it will cause system hang if it's
vulnerable to this issue. Move it to the bottom of the test list
so that we can at least get other tests covered if anything bad happens.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Looks like a reasonable way to solve the problem. Do you mind removing this debug line that was left behind before you apply this?

  print("Test list: {}".format(tests_list))

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Sure thing, thanks for the review!

Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied with debug line removed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_overlayfs_smoke_test/control b/ubuntu_overlayfs_smoke_test/control
2index 714aeb3..bc49078 100644
3--- a/ubuntu_overlayfs_smoke_test/control
4+++ b/ubuntu_overlayfs_smoke_test/control
5@@ -22,6 +22,11 @@ if result == 'GOOD':
6 tests_list = os.listdir(tests_dir)
7 print("Test list: {}".format(tests_list))
8 tests_list.sort()
9+ # The 'shiftfs-hung.sh' test is dangerous as it might cause system hang
10+ # Put it in the end of the queue
11+ if 'shiftfs-hung.sh' in tests_list:
12+ tests_list.remove('shiftfs-hung.sh')
13+ tests_list.append('shiftfs-hung.sh')
14 for test in tests_list:
15 if test in SKIP_LIST:
16 print("SKIPPED: " + test)

Subscribers

People subscribed via source and target branches

to all changes: