test: clean up randtrimwrite test

Simplify the job file by putting write_bw_log in the [global] section.

Rename check_seq to the clearer check_trimwrite since it makes sure that
trims are followed by writes.

Signed-off-by: Vincent Fu <vincent.fu@samsung.com>

diff --git a/t/jobs/t0023.fio b/t/jobs/t0023.fio
index 0250ee1a100c4dabb6f83e206a18f4fc7321d86c..4d76b4a35f9456b5e91193bc0dbe5c18f628ded4 100644 (file)
--- a/t/jobs/t0023.fio
+++ b/t/jobs/t0023.fio
@@ -7,20 +7,19 @@ log_offset=1
 per_job_logs=0
 randrepeat=0
 stonewall
+write_bw_log
 
 # Expected result:     trim issued to random offset followed by write to same offset
 #                      all offsets touched
 #                      block sizes match
 # Buggy result:        something else
 [basic]
-write_bw_log
 
 # Expected result:     trim issued to random offset followed by write to same offset
 #                      all offsets trimmed
 #                      block sizes 8k for both write and trim
 # Buggy result:        something else
 [bs]
-write_bw_log
 bs=4k,4k,8k
 
 # Expected result:     trim issued to random offset followed by write to same offset
@@ -28,7 +27,6 @@ bs=4k,4k,8k
 #                      block sizes match
 # Buggy result:        something else
 [bsrange]
-write_bw_log
 bsrange=512-4k
 
 # Expected result:     trim issued to random offset followed by write to same offset
@@ -36,40 +34,31 @@ bsrange=512-4k
 #                      block sizes match
 # Buggy result:        something else
 [bssplit]
-write_bw_log
 bsrange=512/25:1k:25:2k:25:4k/25
 
 # Expected result:     trim issued to random offset followed by write to same offset
-#                      all offsets touched
 #                      block sizes match
 # Buggy result:        something else
 [basic_no_rm]
-write_bw_log
 norandommap=1
 
 # Expected result:     trim issued to random offset followed by write to same offset
-#                      all offsets trimmed
 #                      block sizes 8k for both write and trim
 # Buggy result:        something else
 [bs_no_rm]
-write_bw_log
 bs=4k,4k,8k
 norandommap=1
 
 # Expected result:     trim issued to random offset followed by write to same offset
-#                      all offsets trimmed
 #                      block sizes match
 # Buggy result:        something else
 [bsrange_no_rm]
-write_bw_log
 bsrange=512-4k
 norandommap=1
 
 # Expected result:     trim issued to random offset followed by write to same offset
-#                      all offsets trimmed
 #                      block sizes match
 # Buggy result:        something else
 [bssplit_no_rm]
-write_bw_log
 bsrange=512/25:1k:25:2k:25:4k/25
 norandommap=1

diff --git a/t/run-fio-tests.py b/t/run-fio-tests.py
index a2b036d9c8bcf1a6e370309c583d7a0293f67c56..07dafc0c448769f07ab46221536392b4e9e8f0c3 100755 (executable)
--- a/t/run-fio-tests.py
+++ b/t/run-fio-tests.py
@@ -652,7 +652,9 @@ class FioJobTest_t0022(FioJobTest):
 class FioJobTest_t0023(FioJobTest):
     """Test consists of fio test job t0023"""
 
-    def check_seq(self, filename):
+    def check_trimwrite(self, filename):
+        """Make sure that trims are followed by writes of the same size at the same offset."""
+
         bw_log_filename = os.path.join(self.test_dir, filename)
         file_data, success = self.get_file(bw_log_filename)
         log_lines = file_data.split('\n')
@@ -692,14 +694,14 @@ class FioJobTest_t0023(FioJobTest):
     def check_result(self):
         super(FioJobTest_t0023, self).check_result()
 
-        self.check_seq("basic_bw.log")
-        self.check_seq("bs_bw.log")
-        self.check_seq("bsrange_bw.log")
-        self.check_seq("bssplit_bw.log")
-        self.check_seq("basic_no_rm_bw.log")
-        self.check_seq("bs_no_rm_bw.log")
-        self.check_seq("bsrange_no_rm_bw.log")
-        self.check_seq("bssplit_no_rm_bw.log")
+        self.check_trimwrite("basic_bw.log")
+        self.check_trimwrite("bs_bw.log")
+        self.check_trimwrite("bsrange_bw.log")
+        self.check_trimwrite("bssplit_bw.log")
+        self.check_trimwrite("basic_no_rm_bw.log")
+        self.check_trimwrite("bs_no_rm_bw.log")
+        self.check_trimwrite("bsrange_no_rm_bw.log")
+        self.check_trimwrite("bssplit_no_rm_bw.log")
 
         # TODO make sure all offsets were touched