From: "Eric W. Biederman" <ebiederm@xmission.com>
To: Eric Wong <e@80x24.org>
Cc: meta@public-inbox.org, "Eric W. Biederman" <ebiederm@xmission.com>
Subject: [PATCH 04/13] t/v[12]reindex.t: Place expected second in Xapian tests
Date: Wed, 1 Aug 2018 11:43:35 -0500 [thread overview]
Message-ID: <20180801164344.7911-4-ebiederm@xmission.com> (raw)
In-Reply-To: <878t5qkpis.fsf@xmission.com>
Place the expected value second in is and isnt tests because when
these tests fail they report the second value as the expected value.
A report saying got 0 expected 8 'no Xapian search results' can be confusing.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
t/v1reindex.t | 6 +++---
t/v2reindex.t | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/v1reindex.t b/t/v1reindex.t
index fdffdaeee892..de4fafda5ae9 100644
--- a/t/v1reindex.t
+++ b/t/v1reindex.t
@@ -144,7 +144,7 @@ ok(!-d $xap, 'Xapian directories removed again');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
my $mset = $ibx->search->query('hello world', {mset=>1});
- isnt(0, $mset->size, 'got Xapian search results');
+ isnt($mset->size, 0, 'got Xapian search results');
}
ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
@@ -166,7 +166,7 @@ ok(!-d $xap, 'Xapian directories removed again');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
my $mset = $ibx->search->reopen->query('hello world', {mset=>1});
- is(0, $mset->size, "no Xapian search results");
+ is($mset->size, 0, "no Xapian search results");
}
# upgrade existing basic to medium
@@ -184,7 +184,7 @@ ok(!-d $xap, 'Xapian directories removed again');
is($@, '', 'no error from indexing');
is_deeply(\@warn, [], 'no warnings');
my $mset = $ibx->search->reopen->query('hello world', {mset=>1});
- isnt(0, $mset->size, 'search OK after basic -> medium');
+ isnt($mset->size, 0, 'search OK after basic -> medium');
}
done_testing();
diff --git a/t/v2reindex.t b/t/v2reindex.t
index 4d06c6ce6ea6..67d8be787a78 100644
--- a/t/v2reindex.t
+++ b/t/v2reindex.t
@@ -119,7 +119,7 @@ ok(!-d $xap, 'Xapian directories removed again');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
my $mset = $ibx->search->query('"hello world"', {mset=>1});
- isnt(0, $mset->size, "phrase search succeeds on indexlevel=full");
+ isnt($mset->size, 0, "phrase search succeeds on indexlevel=full");
for (<"$xap/*/*">) { $sizes{$ibx->{indexlevel}} += -s _ if -f $_ }
}
@@ -146,11 +146,11 @@ ok(!-d $xap, 'Xapian directories removed again');
# phrase searches still work
delete $ibx->{search};
my $mset = $ibx->search->query('"hello world"', {mset=>1});
- is(0, $mset->size, 'phrase search does not work on medium');
+ is($mset->size, 0, 'phrase search does not work on medium');
}
my $mset = $ibx->search->query('hello world', {mset=>1});
- isnt(0, $mset->size, "normal search works on indexlevel=medium");
+ isnt($mset->size, 0, "normal search works on indexlevel=medium");
for (<"$xap/*/*">) { $sizes{$ibx->{indexlevel}} += -s _ if -f $_ }
ok($sizes{full} > $sizes{medium}, 'medium is smaller than full');
}
@@ -173,7 +173,7 @@ ok(!-d $xap, 'Xapian directories removed again');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
my $mset = $ibx->search->query('hello', {mset=>1});
- is(0, $mset->size, "search fails on indexlevel='basic'");
+ is($mset->size, 0, "search fails on indexlevel='basic'");
for (<"$xap/*/*">) { $sizes{$ibx->{indexlevel}} += -s _ if -f $_ }
ok($sizes{medium} > $sizes{basic}, 'basic is smaller than medium');
}
--
2.17.1
next prev parent reply other threads:[~2018-08-01 16:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 16:41 [PATCH 00/13]: Incremental index fixes Eric W. Biederman
2018-08-01 16:43 ` [PATCH 01/13] Import.pm: Don't assume {in} and {out} always exist Eric W. Biederman
2018-08-01 16:43 ` [PATCH 02/13] t/v1reindex.t: Isolate the test cases Eric W. Biederman
2018-08-01 16:43 ` [PATCH 03/13] t/v2reindex.t: Isolate the test cases more Eric W. Biederman
2018-08-01 16:43 ` Eric W. Biederman [this message]
2018-08-01 16:43 ` [PATCH 05/13] t/v[12]reindex.t: Test that the resulting msgmap is as expected Eric W. Biederman
2018-08-01 16:43 ` [PATCH 06/13] t/v[12]reindex.t: Test incremental indexing works Eric W. Biederman
2018-08-01 16:43 ` [PATCH 07/13] SearchIdx.pm: Always assign numbers backwards during incremental indexing Eric W. Biederman
2018-08-01 16:43 ` [PATCH 08/13] Msgmap.pm: Track the largest value of num ever assigned Eric W. Biederman
2018-08-02 3:00 ` Eric Wong
2018-08-02 3:44 ` [WIP] searchidx: support incremental indexing on indexlevel=basic Eric Wong
2018-08-02 12:25 ` Eric W. Biederman
2018-08-02 17:12 ` Eric W. Biederman
2018-08-02 18:15 ` Eric W. Biederman
2019-05-14 2:04 ` [PATCH 0/3] incremental index fixes for indexlevel=basic Eric Wong
2019-05-14 2:04 ` [PATCH 1/3] v1writable: new wrapper which is closer to v2writable Eric Wong
2019-05-14 2:04 ` [PATCH 2/3] v2writable: allow setting nproc via creat options Eric Wong
2019-05-14 2:04 ` [PATCH 3/3] searchidx: fix incremental index with indexlevel=basic on v1 Eric Wong
2018-08-02 12:08 ` [PATCH 08/13] Msgmap.pm: Track the largest value of num ever assigned Eric W. Biederman
2018-08-01 16:43 ` [PATCH 09/13] t/v[12]reindex.t Verify num_highwater Eric W. Biederman
2018-08-01 16:43 ` [PATCH 10/13] t/v[12]reindex.t: Verify the num highwater is as expected Eric W. Biederman
2018-08-01 16:43 ` [PATCH 11/13] SearchIdx,V2Writeable: Update num_highwater on optimized deletes Eric W. Biederman
2018-08-01 16:43 ` [PATCH 12/13] V2Writeable.pm: Ensure that a found message number is in the msgmap Eric W. Biederman
2018-08-01 16:43 ` [PATCH 13/13] V2Writeable.pm: In unindex_oid delete the message from msgmap Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180801164344.7911-4-ebiederm@xmission.com \
--to=ebiederm@xmission.com \
--cc=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).