From 5c8c7b1172122b0f946f2c934f74cf8c0f4b114c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 17 Oct 2014 10:08:59 +0200
Subject: [PATCH] tests: xbps-rindex/add: rework some tests to use xbps-query
 -s rather than -Ro.

---
 tests/xbps/xbps-rindex/add_test.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/xbps/xbps-rindex/add_test.sh b/tests/xbps/xbps-rindex/add_test.sh
index a84b5178..b5f01250 100644
--- a/tests/xbps/xbps-rindex/add_test.sh
+++ b/tests/xbps/xbps-rindex/add_test.sh
@@ -21,10 +21,12 @@ update_body() {
 	xbps-rindex -a *.xbps
 	atf_check_equal $? 0
 	cd ..
-	result="$(xbps-query -r root -C empty.conf --repository=some_repo -o \*)"
-	expected="foo-1.1_1: /file00 (some_repo)"
+	result="$(xbps-query -C empty.conf --repository=some_repo -s '')"
+	expected="[-] foo-1.1_1 foo pkg"
 	rv=0
 	if [ "$result" != "$expected" ]; then
+		echo "result: $result"
+		echo "expected: $expected"
 		rv=1
 	fi
 	atf_check_equal $rv 0
@@ -47,10 +49,12 @@ revert_body() {
 	xbps-rindex -a *.xbps
 	atf_check_equal $? 0
 	cd ..
-	result="$(xbps-query -r root -C empty.conf --repository=some_repo -o \*)"
-	expected="foo-1.0_1: /file00 (some_repo)"
+	result="$(xbps-query -C empty.conf --repository=some_repo -s '')"
+	expected="[-] foo-1.0_1 foo pkg"
 	rv=0
 	if [ "$result" != "$expected" ]; then
+		echo "result: $result"
+		echo "expected: $expected"
 		rv=1
 	fi
 	atf_check_equal $rv 0