Skip to content

Commit 3daaa6a

Browse files
authored
Merge pull request #1229 from mnordsletten/intrusive
intrusive tests: Declared a number of tests as intrusive
2 parents e497335 + ec33713 commit 3daaa6a

6 files changed

Lines changed: 12 additions & 5 deletions

File tree

test/fs/integration/fat32/vm.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"type" : "virtio",
66
"format" : "raw",
77
"media" : "disk"
8-
}]
8+
}],
9+
"intrusive" : "True"
910
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"image": "test_memdisk.img",
3-
"mem": 256
3+
"mem": 256,
4+
"intrusive" : "True"
45
}

test/fs/integration/vfs/vm.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
"type" : "virtio",
1313
"format" : "raw",
1414
"media" : "disk"
15-
}]
15+
}],
16+
"intrusive": "True"
1617
}

test/fs/integration/virtio_block/vm.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"drives" : [{"file" : "../image.img",
44
"type" : "virtio",
55
"format": "raw",
6-
"media": "disk" }]
6+
"media": "disk" }],
7+
"intrusive" : "True"
78
}

test/net/integration/router/vm.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
"mem" : 320,
55
"net" : [{"device" : "virtio"},
66
{"device" : "virtio"}],
7-
"intrusive": "True"
7+
"intrusive": "True",
8+
"time_sensitive" : "True"
89
}

test/testrunner.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ def filter_tests(all_tests, arguments):
435435
for test in tests_added:
436436
for argument in skip_properties:
437437
if test.properties_[argument] and test not in skipped_tests:
438+
test.skip_ = True
439+
test.skip_reason_ = "Test marked skip on command line"
438440
skipped_tests.append(test)
439441

440442
# Print all the skipped tests

0 commit comments

Comments
 (0)