summaryrefslogtreecommitdiff
path: root/trust/tests/test-index.c
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2013-06-28 17:19:22 +0200
committerStef Walter <stef@thewalter.net>2013-07-03 11:46:28 +0200
commit1c4522e5df79bd197feab8448008fc2bf6b4ea2e (patch)
treeb33284d2501cb32a6cf9fc0e9b0983220c174fb7 /trust/tests/test-index.c
parent17bc43cb82320f2aba4ccb804bd8599232524c6a (diff)
trust: Rename p11_index_batch() to p11_index_load()
The name makes it clearer what's going on. This is only used during loading, so we can track whether a change has resulted from the trust module or from the file storage.
Diffstat (limited to 'trust/tests/test-index.c')
-rw-r--r--trust/tests/test-index.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/trust/tests/test-index.c b/trust/tests/test-index.c
index 85c44b7..8932da6 100644
--- a/trust/tests/test-index.c
+++ b/trust/tests/test-index.c
@@ -876,9 +876,9 @@ test_change_batch (void)
on_change_batching = true;
on_change_called = 0;
- p11_index_batch (index);
+ p11_index_load (index);
- assert (p11_index_in_batch (index));
+ assert (p11_index_loading (index));
rv = p11_index_add (index, original, 2, NULL);
assert (rv == CKR_OK);
@@ -896,7 +896,7 @@ test_change_batch (void)
assert_num_eq (0, on_change_called);
/* Nested batch is a noop */
- p11_index_batch (index);
+ p11_index_load (index);
rv = p11_index_remove (index, handle);
assert (rv == CKR_OK);
@@ -909,7 +909,7 @@ test_change_batch (void)
*/
p11_index_finish (index);
- assert (!p11_index_in_batch (index));
+ assert (!p11_index_loading (index));
/*
* Only three calls, because later operations on the
@@ -920,7 +920,7 @@ test_change_batch (void)
/* This is a noop */
p11_index_finish (index);
- assert (!p11_index_in_batch (index));
+ assert (!p11_index_loading (index));
p11_index_free (index);
}
@@ -971,7 +971,7 @@ test_change_nested (void)
on_change_called = 0;
- p11_index_batch (index);
+ p11_index_load (index);
rv = p11_index_add (index, original, 2, NULL);
assert (rv == CKR_OK);
p11_index_finish (index);