Load cache asynchronously

core/file_caches_test.go

@@ -14,6 +14,13 @@ import (
 	. "github.com/onsi/gomega"
 )
 
+// Call NewFileCache and wait for it to be ready
+func callNewFileCache(name, cacheSize, cacheFolder string, maxItems int, getReader ReadFunc) *fileCache {
+	fc := NewFileCache(name, cacheSize, cacheFolder, maxItems, getReader)
+	Eventually(func() bool { return fc.Ready() }).Should(BeTrue())
+	return fc
+}
+
 var _ = Describe("File Caches", func() {
 	BeforeEach(func() {
 		conf.Server.DataFolder, _ = ioutil.TempDir("", "file_caches")
@@ -24,31 +31,29 @@ var _ = Describe("File Caches", func() {
 
 	Describe("NewFileCache", func() {
 		It("creates the cache folder", func() {
-			Expect(NewFileCache("test", "1k", "test", 0, nil)).ToNot(BeNil())
+			Expect(callNewFileCache("test", "1k", "test", 0, nil)).ToNot(BeNil())
 
 			_, err := os.Stat(filepath.Join(conf.Server.DataFolder, "test"))
 			Expect(os.IsNotExist(err)).To(BeFalse())
 		})
 
 		It("creates the cache folder with invalid size", func() {
-			fc, err := NewFileCache("test", "abc", "test", 0, nil)
-			Expect(err).To(BeNil())
+			fc := callNewFileCache("test", "abc", "test", 0, nil)
 			Expect(fc.cache).ToNot(BeNil())
-			Expect(fc.disabled).To(BeFalse())
+			Expect(fc.disabled.Get()).To(BeFalse())
 		})
 
 		It("returns empty if cache size is '0'", func() {
-			fc, err := NewFileCache("test", "0", "test", 0, nil)
-			Expect(err).To(BeNil())
+			fc := callNewFileCache("test", "0", "test", 0, nil)
 			Expect(fc.cache).To(BeNil())
-			Expect(fc.disabled).To(BeTrue())
+			Expect(fc.disabled.Get()).To(BeTrue())
 		})
 	})
 
 	Describe("FileCache", func() {
 		It("caches data if cache is enabled", func() {
 			called := false
-			fc, _ := NewFileCache("test", "1KB", "test", 0, func(ctx context.Context, arg fmt.Stringer) (io.Reader, error) {
+			fc := callNewFileCache("test", "1KB", "test", 0, func(ctx context.Context, arg fmt.Stringer) (io.Reader, error) {
 				called = true
 				return strings.NewReader(arg.String()), nil
 			})
@@ -67,7 +72,7 @@ var _ = Describe("File Caches", func() {
 
 		It("does not cache data if cache is disabled", func() {
 			called := false
-			fc, _ := NewFileCache("test", "0", "test", 0, func(ctx context.Context, arg fmt.Stringer) (io.Reader, error) {
+			fc := callNewFileCache("test", "0", "test", 0, func(ctx context.Context, arg fmt.Stringer) (io.Reader, error) {
 				called = true
 				return strings.NewReader(arg.String()), nil
 			})