From 72ededd5e37824a26e89650b6d349dc91326dece Mon Sep 17 00:00:00 2001
From: Martin Nordsletten <mnordsletten@gmail.com>
Date: Thu, 9 Mar 2017 14:27:49 +0100
Subject: [PATCH 1/2] intrusive tests: Declared a number of tests as intrusive

---
 test/fs/integration/fat32/vm.json        | 3 ++-
 test/fs/integration/memdisk/vm.json      | 3 ++-
 test/fs/integration/vfs/vm.json          | 3 ++-
 test/fs/integration/virtio_block/vm.json | 3 ++-
 test/net/integration/router/vm.json      | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/fs/integration/fat32/vm.json b/test/fs/integration/fat32/vm.json
index c193acbf39..2ffb19362e 100644
--- a/test/fs/integration/fat32/vm.json
+++ b/test/fs/integration/fat32/vm.json
@@ -5,5 +5,6 @@
     "type" : "virtio",
     "format" : "raw",
     "media" : "disk"
-  }]
+  }],
+  "intrusive" : "True"
 }
diff --git a/test/fs/integration/memdisk/vm.json b/test/fs/integration/memdisk/vm.json
index aa85b0cd17..5677745220 100644
--- a/test/fs/integration/memdisk/vm.json
+++ b/test/fs/integration/memdisk/vm.json
@@ -1,4 +1,5 @@
 {
   "image": "test_memdisk.img",
-  "mem": 256
+  "mem": 256, 
+  "intrusive" : "True"
 }
diff --git a/test/fs/integration/vfs/vm.json b/test/fs/integration/vfs/vm.json
index e770f16ae9..1f0a289d9d 100644
--- a/test/fs/integration/vfs/vm.json
+++ b/test/fs/integration/vfs/vm.json
@@ -12,5 +12,6 @@
       "type" : "virtio",
       "format" : "raw",
       "media" : "disk"
-    }]
+    }],
+  "intrusive": "True"
 }
diff --git a/test/fs/integration/virtio_block/vm.json b/test/fs/integration/virtio_block/vm.json
index 716f8fcbca..6f0eb9064a 100644
--- a/test/fs/integration/virtio_block/vm.json
+++ b/test/fs/integration/virtio_block/vm.json
@@ -3,5 +3,6 @@
   "drives" : [{"file" : "../image.img",
                "type" : "virtio",
                "format": "raw",
-               "media": "disk" }]
+               "media": "disk" }],
+  "intrusive" : "True"
 }
diff --git a/test/net/integration/router/vm.json b/test/net/integration/router/vm.json
index 8ec6c22095..4bf938370e 100644
--- a/test/net/integration/router/vm.json
+++ b/test/net/integration/router/vm.json
@@ -4,5 +4,6 @@
   "mem" : 320,
   "net" : [{"device" : "virtio"},
            {"device" : "virtio"}],
-  "intrusive": "True"
+  "intrusive": "True",
+  "time_sensitive" : "True"
 }

From ec337134bb391ae1a32eda858ddb0f8a962f7c9a Mon Sep 17 00:00:00 2001
From: Martin Nordsletten <mnordsletten@gmail.com>
Date: Thu, 9 Mar 2017 14:40:29 +0100
Subject: [PATCH 2/2] testrunner: Proper skip handling when skipping by
 property

---
 test/testrunner.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/testrunner.py b/test/testrunner.py
index 94445abbfa..81bdf713d8 100755
--- a/test/testrunner.py
+++ b/test/testrunner.py
@@ -435,6 +435,8 @@ def filter_tests(all_tests, arguments):
     for test in tests_added:
         for argument in skip_properties:
             if test.properties_[argument] and test not in skipped_tests:
+                test.skip_ = True
+                test.skip_reason_ = "Test marked skip on command line"
                 skipped_tests.append(test)
 
     # Print all the skipped tests