X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fovsdb-log.at;h=055dc70c520e4f3e441ef9e8c2a7053309558491;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=b0c1c97bd8fabad90dd39e9f75c7accd19068c16;hpb=41709cccb8099972f9c6c3faf583b1286cb92e8a;p=sliver-openvswitch.git

diff --git a/tests/ovsdb-log.at b/tests/ovsdb-log.at
index b0c1c97bd..055dc70c5 100644
--- a/tests/ovsdb-log.at
+++ b/tests/ovsdb-log.at
@@ -3,12 +3,12 @@ AT_BANNER([OVSDB -- logging])
 AT_SETUP([create empty, reread])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([log])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_CREAT|O_RDWR'], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file create], [0], 
   [file: open successful
 ], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read], [0], 
   [file: open successful
 file: read: end of log
 ], [ignore])
@@ -18,13 +18,13 @@ AT_CLEANUP
 AT_SETUP([write one, reread])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]']], [0], 
   [[file: open successful
 file: write:[0] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: end of log
@@ -32,21 +32,21 @@ file: read: end of log
 AT_CHECK([test -f .file.~lock~])
 AT_CLEANUP
 
-AT_SETUP([check that O_EXCL works])
+AT_SETUP([check that create fails if file exists])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[1]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[1]']], [0], 
   [[file: open successful
 file: write:[1] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read], [0], 
   [[file: open successful
 file: read: [1]
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_CREAT|O_RDWR|O_EXCL' read], [1], 
+AT_CHECK(
+  [test-ovsdb log-io file create read], [1],
   [], [test-ovsdb: I/O error: create: file failed (File exists)
 ])
 AT_CHECK([test -f .file.~lock~])
@@ -55,15 +55,15 @@ AT_CLEANUP
 AT_SETUP([write one, reread])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
 file: write:[2] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -76,23 +76,23 @@ AT_CLEANUP
 AT_SETUP([write one, reread, append])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
 file: write:[2] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_RDWR' read read read 'write:["append"]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file read/write read read read 'write:["append"]']], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
 file: read: [2]
 file: write:["append"] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -106,21 +106,21 @@ AT_CLEANUP
 AT_SETUP([write, reread one, overwrite])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
 file: write:[2] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_RDWR' read 'write:["more data"]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file read/write read 'write:["more data"]']], [0], 
   [[file: open successful
 file: read: [0]
 file: write:["more data"] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: ["more data"]
@@ -132,16 +132,16 @@ AT_CLEANUP
 AT_SETUP([write, add corrupted data, read])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
 file: write:[2] successful
 ]], [ignore])
 AT_CHECK([echo 'xxx' >> file])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -154,16 +154,16 @@ AT_CLEANUP
 AT_SETUP([write, add corrupted data, read, overwrite])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
 file: write:[2] successful
 ]], [ignore])
 AT_CHECK([echo 'xxx' >> file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_RDWR' read read read read 'write:[3]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file read/write read read read read 'write:[3]']], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -171,8 +171,8 @@ file: read: [2]
 file: read failed: syntax error: file: parse error at offset 174 in header line "xxx"
 file: write:[3] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -186,8 +186,8 @@ AT_CLEANUP
 AT_SETUP([write, corrupt some data, read, overwrite])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
@@ -197,16 +197,16 @@ AT_CHECK([[sed 's/\[2]/[3]/' < file > file.tmp]])
 AT_CHECK([mv file.tmp file])
 AT_CHECK([[grep -c '\[3]' file]], [0], [1
 ])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_RDWR' read read read 'write:["longer data"]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file read/write read read read 'write:["longer data"]']], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
 file: read failed: syntax error: file: 4 bytes starting at offset 170 have SHA-1 hash 5c031e5c0d3a9338cc127ebe40bb2748b6a67e78 but should have hash 98f55556e7ffd432381b56a19bd485b3e6446442
 file: write:["longer data"] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -219,8 +219,8 @@ AT_CLEANUP
 AT_SETUP([write, truncate file, read, overwrite])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
@@ -230,16 +230,16 @@ AT_CHECK([[sed 's/\[2]/2/' < file > file.tmp]])
 AT_CHECK([mv file.tmp file])
 AT_CHECK([[grep -c '^2$' file]], [0], [1
 ])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_RDWR' read read read 'write:["longer data"]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file read/write read read read 'write:["longer data"]']], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
-file: read failed: I/O error: file: error reading 4 bytes starting at offset 170 (unexpected end of file)
+file: read failed: I/O error: file: error reading 4 bytes starting at offset 170 (End of file)
 file: write:["longer data"] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
@@ -252,25 +252,25 @@ AT_CLEANUP
 AT_SETUP([write bad JSON, read, overwrite])
 AT_KEYWORDS([ovsdb log])
 AT_CAPTURE_FILE([file])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_CREAT|O_RDWR' 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file create 'write:[0]' 'write:[1]' 'write:[2]']], [0], 
   [[file: open successful
 file: write:[0] successful
 file: write:[1] successful
 file: write:[2] successful
 ]], [ignore])
 AT_CHECK([[printf '%s\n%s\n' 'OVSDB JSON 5 d910b02871075d3156ec8675dfc95b7d5d640aa6' 'null' >> file]])
-OVS_CHECK_LCOV(
-  [[test-ovsdb log-io file 'O_RDWR' read read read read 'write:["replacement data"]']], [0], 
+AT_CHECK(
+  [[test-ovsdb log-io file read/write read read read read 'write:["replacement data"]']], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]
 file: read: [2]
-file: read failed: syntax error: file: 5 bytes starting at offset 228 are not valid JSON (syntax error at beginning of input)
+file: read failed: syntax error: file: 5 bytes starting at offset 228 are not valid JSON (line 0, column 4, byte 4: syntax error at beginning of input)
 file: write:["replacement data"] successful
 ]], [ignore])
-OVS_CHECK_LCOV(
-  [test-ovsdb log-io file 'O_RDONLY' read read read read read], [0], 
+AT_CHECK(
+  [test-ovsdb log-io file read-only read read read read read], [0], 
   [[file: open successful
 file: read: [0]
 file: read: [1]