Merge pull request #988 from MichaelMure/fix-cache-test

cache: fix tests?

2 files changed, 76 insertions, 102 deletions

diff --git a/cache/repo_cache.go b/cache/repo_cache.go
index edfe1baf..130500cb 100644
--- a/cache/repo_cache.go
+++ b/cache/repo_cache.go
@@ -40,14 +40,14 @@ type cacheMgmt interface {
 
 // RepoCache is a cache for a Repository. This cache has multiple functions:
 //
-// 1. After being loaded, a Bug is kept in memory in the cache, allowing for fast
-// 		access later.
-// 2. The cache maintain in memory and on disk a pre-digested excerpt for each bug,
-// 		allowing for fast querying the whole set of bugs without having to load
-//		them individually.
-// 3. The cache guarantee that a single instance of a Bug is loaded at once, avoiding
-// 		loss of data that we could have with multiple copies in the same process.
-// 4. The same way, the cache maintain in memory a single copy of the loaded identities.
+//  1. After being loaded, a Bug is kept in memory in the cache, allowing for fast
+//     access later.
+//  2. The cache maintain in memory and on disk a pre-digested excerpt for each bug,
+//     allowing for fast querying the whole set of bugs without having to load
+//     them individually.
+//  3. The cache guarantee that a single instance of a Bug is loaded at once, avoiding
+//     loss of data that we could have with multiple copies in the same process.
+//  4. The same way, the cache maintain in memory a single copy of the loaded identities.
 //
 // The cache also protect the on-disk data by locking the git repository for its
 // own usage, by writing a lock file. Of course, normal git operations are not
diff --git a/cache/repo_cache_test.go b/cache/repo_cache_test.go
index 39814733..07a3fee8 100644
--- a/cache/repo_cache_test.go
+++ b/cache/repo_cache_test.go
@@ -29,104 +29,89 @@ func TestCache(t *testing.T) {
 		return count
 	}
 
-	var (
-		cache *RepoCache
-		bug1  *BugCache
-		iden1 *IdentityCache
-	)
-
-	t.Run("entity operations on cache", func(t *testing.T) {
-		cache, err := NewRepoCacheNoEvents(repo)
-		require.NoError(t, err)
-
-		// Create, set and get user identity
-		iden1, err = cache.Identities().New("René Descartes", "rene@descartes.fr")
-		require.NoError(t, err)
-		err = cache.SetUserIdentity(iden1)
-		require.NoError(t, err)
-		userIden, err := cache.GetUserIdentity()
-		require.NoError(t, err)
-		require.Equal(t, iden1.Id(), userIden.Id())
-
-		// it's possible to create two identical identities
-		iden2, err := cache.Identities().New("René Descartes", "rene@descartes.fr")
-		require.NoError(t, err)
+	cache, err := NewRepoCacheNoEvents(repo)
+	require.NoError(t, err)
 
-		// Two identical identities yield a different id
-		require.NotEqual(t, iden1.Id(), iden2.Id())
+	// Create, set and get user identity
+	iden1, err := cache.Identities().New("René Descartes", "rene@descartes.fr")
+	require.NoError(t, err)
+	err = cache.SetUserIdentity(iden1)
+	require.NoError(t, err)
+	userIden, err := cache.GetUserIdentity()
+	require.NoError(t, err)
+	require.Equal(t, iden1.Id(), userIden.Id())
 
-		// There is now two identities in the cache
-		require.Len(t, cache.Identities().AllIds(), 2)
-		require.Len(t, cache.identities.excerpts, 2)
-		require.Len(t, cache.identities.cached, 2)
-		require.Equal(t, uint64(2), indexCount(t, identity.Namespace))
-		require.Equal(t, uint64(0), indexCount(t, bug.Namespace))
+	// it's possible to create two identical identities
+	iden2, err := cache.Identities().New("René Descartes", "rene@descartes.fr")
+	require.NoError(t, err)
 
-		// Create a bug
-		bug1, _, err = cache.Bugs().New("title", "message")
-		require.NoError(t, err)
+	// Two identical identities yield a different id
+	require.NotEqual(t, iden1.Id(), iden2.Id())
 
-		// It's possible to create two identical bugs
-		bug2, _, err := cache.Bugs().New("title", "marker")
-		require.NoError(t, err)
+	// There is now two identities in the cache
+	require.Len(t, cache.Identities().AllIds(), 2)
+	require.Len(t, cache.identities.excerpts, 2)
+	require.Len(t, cache.identities.cached, 2)
+	require.Equal(t, uint64(2), indexCount(t, identity.Namespace))
+	require.Equal(t, uint64(0), indexCount(t, bug.Namespace))
 
-		// two identical bugs yield a different id
-		require.NotEqual(t, bug1.Id(), bug2.Id())
+	// Create a bug
+	bug1, _, err := cache.Bugs().New("title", "message")
+	require.NoError(t, err)
 
-		// There is now two bugs in the cache
-		require.Len(t, cache.Bugs().AllIds(), 2)
-		require.Len(t, cache.bugs.excerpts, 2)
-		require.Len(t, cache.bugs.cached, 2)
-		require.Equal(t, uint64(2), indexCount(t, identity.Namespace))
-		require.Equal(t, uint64(2), indexCount(t, bug.Namespace))
+	// It's possible to create two identical bugs
+	bug2, _, err := cache.Bugs().New("title", "marker")
+	require.NoError(t, err)
 
-		// Resolving
-		_, err = cache.Identities().Resolve(iden1.Id())
-		require.NoError(t, err)
-		_, err = cache.Identities().ResolveExcerpt(iden1.Id())
-		require.NoError(t, err)
-		_, err = cache.Identities().ResolvePrefix(iden1.Id().String()[:10])
-		require.NoError(t, err)
+	// two identical bugs yield a different id
+	require.NotEqual(t, bug1.Id(), bug2.Id())
 
-		_, err = cache.Bugs().Resolve(bug1.Id())
-		require.NoError(t, err)
-		_, err = cache.Bugs().ResolveExcerpt(bug1.Id())
-		require.NoError(t, err)
-		_, err = cache.Bugs().ResolvePrefix(bug1.Id().String()[:10])
-		require.NoError(t, err)
+	// There is now two bugs in the cache
+	require.Len(t, cache.Bugs().AllIds(), 2)
+	require.Len(t, cache.bugs.excerpts, 2)
+	require.Len(t, cache.bugs.cached, 2)
+	require.Equal(t, uint64(2), indexCount(t, identity.Namespace))
+	require.Equal(t, uint64(2), indexCount(t, bug.Namespace))
 
-		// Querying
-		q, err := query.Parse("status:open author:descartes sort:edit-asc")
-		require.NoError(t, err)
-		res, err := cache.Bugs().Query(q)
-		require.NoError(t, err)
-		require.Len(t, res, 2)
+	// Resolving
+	_, err = cache.Identities().Resolve(iden1.Id())
+	require.NoError(t, err)
+	_, err = cache.Identities().ResolveExcerpt(iden1.Id())
+	require.NoError(t, err)
+	_, err = cache.Identities().ResolvePrefix(iden1.Id().String()[:10])
+	require.NoError(t, err)
 
-		q, err = query.Parse("status:open marker") // full-text search
-		require.NoError(t, err)
-		res, err = cache.Bugs().Query(q)
-		require.NoError(t, err)
-		require.Len(t, res, 1)
+	_, err = cache.Bugs().Resolve(bug1.Id())
+	require.NoError(t, err)
+	_, err = cache.Bugs().ResolveExcerpt(bug1.Id())
+	require.NoError(t, err)
+	_, err = cache.Bugs().ResolvePrefix(bug1.Id().String()[:10])
+	require.NoError(t, err)
 
-		// Close
-		require.NoError(t, cache.Close())
-		require.Empty(t, cache.bugs.cached)
-		require.Empty(t, cache.bugs.excerpts)
-		require.Empty(t, cache.identities.cached)
-		require.Empty(t, cache.identities.excerpts)
-	})
+	// Querying
+	q, err := query.Parse("status:open author:descartes sort:edit-asc")
+	require.NoError(t, err)
+	res, err := cache.Bugs().Query(q)
+	require.NoError(t, err)
+	require.Len(t, res, 2)
 
-	t.Run("closed caches are empty", func(t *testing.T) {
-		t.Skip()
-		cache, err := NewRepoCacheNoEvents(repo)
-		require.NoError(t, err)
+	q, err = query.Parse("status:open marker") // full-text search
+	require.NoError(t, err)
+	res, err = cache.Bugs().Query(q)
+	require.NoError(t, err)
+	require.Len(t, res, 1)
 
-		require.Empty(t, cache.identities.excerpts)
-	})
+	// Close
+	require.NoError(t, cache.Close())
+	require.Empty(t, cache.bugs.cached)
+	require.Empty(t, cache.bugs.excerpts)
+	require.Empty(t, cache.identities.cached)
+	require.Empty(t, cache.identities.excerpts)
 
 	// Reload, only excerpt are loaded, but as we need to load the identities used in the bugs
 	// to check the signatures, we also load the identity used above
-	cache = createTestRepoCacheNoEvents(t, repo)
+	cache, err = NewRepoCacheNoEvents(repo)
+	require.NoError(t, err)
 
 	require.Len(t, cache.bugs.cached, 0)
 	require.Len(t, cache.bugs.excerpts, 2)
@@ -136,7 +121,7 @@ func TestCache(t *testing.T) {
 	require.Equal(t, uint64(2), indexCount(t, bug.Namespace))
 
 	// Resolving load from the disk
-	_, err := cache.Identities().Resolve(iden1.Id())
+	_, err = cache.Identities().Resolve(iden1.Id())
 	require.NoError(t, err)
 	_, err = cache.Identities().ResolveExcerpt(iden1.Id())
 	require.NoError(t, err)
@@ -352,14 +337,3 @@ func createTestRepoCacheNoEvents(t *testing.T, repo repository.TestedRepo) *Repo
 
 	return cache
 }
-
-func indexCount(t *testing.T, repo repository.TestedRepo, name string) uint64 {
-	t.Helper()
-
-	idx, err := repo.GetIndex(name)
-	require.NoError(t, err)
-	count, err := idx.DocCount()
-	require.NoError(t, err)
-
-	return count
-}