diff mbox series

[ovs-dev,02/22] tests: ovsdb: Use diff -up format for replay test.

Message ID 20231214010431.1664005-3-i.maximets@ovn.org
State Accepted
Commit 0a2e16b67dbf16d21435f6ec5fc69d30ed98525d
Delegated to: Ilya Maximets
Headers show
Series [ovs-dev,01/22] ovsdb-server.at: Enbale debug logs in active-backup tests. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Ilya Maximets Dec. 14, 2023, 1:04 a.m. UTC 
It's easier to analyze failures when the lines that are different
are shown next to each other.

Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
---
 tests/ovsdb-client.at | 6 +++---
 tests/ovsdb-server.at | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Mike Pattrick Jan. 2, 2024, 3:18 p.m. UTC | #1 
On Wed, Dec 13, 2023 at 8:05 PM Ilya Maximets <i.maximets@ovn.org> wrote:
>
> It's easier to analyze failures when the lines that are different
> are shown next to each other.
>
> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>

Acked-by: Mike Pattrick <mkp@redhat.com>
diff mbox series

Patch

diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at
index 68fb962bd..dcddb2587 100644
--- a/tests/ovsdb-client.at
+++ b/tests/ovsdb-client.at
@@ -270,8 +270,8 @@  AT_CHECK([ovsdb-client --replay=./replay_dir                      dnl
 dnl Waiting for client to exit the same way as it exited during recording.
 OVS_WAIT_WHILE([test -e ovsdb-client.pid])
 
-AT_CHECK([diff monitor.stdout monitor-replay.stdout])
-AT_CHECK([diff monitor.stderr monitor-replay.stderr])
+AT_CHECK([diff -u monitor.stdout monitor-replay.stdout])
+AT_CHECK([diff -u monitor.stderr monitor-replay.stderr])
 
 dnl Stripping out timestamps, PIDs and poll_loop warnings from the log.
 dnl Also stripping socket_util errors as sockets are not used in replay.
@@ -284,6 +284,6 @@  m4_define([CLEAN_LOG_FILE],
 CLEAN_LOG_FILE([monitor.log], [monitor.log.clear])
 CLEAN_LOG_FILE([monitor-replay.log], [monitor-replay.log.clear])
 
-AT_CHECK([diff monitor.log.clear monitor-replay.log.clear])
+AT_CHECK([diff -u monitor.log.clear monitor-replay.log.clear])
 
 AT_CLEANUP
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 35286db37..6eb758e22 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -2394,6 +2394,6 @@  CLEAN_LOG_FILE([2.log], [2.log.clear])
 
 dnl Checking that databases and logs are equal.
 AT_CHECK([diff db.clear ./replay_dir/db.copy.clear])
-AT_CHECK([diff 1.log.clear 2.log.clear])
+AT_CHECK([diff -u 1.log.clear 2.log.clear])
 
 AT_CLEANUP