6acb3a0d7e
The "testing" package adds some flags in its init function, so utilities that import distribution code may print a page of extra testing flags in their help output. This commit solves the issue by moving an import of "testing" in the registry/storage/cache package to a new registry/storage/cache/cachecheck package, which is only imported by tests. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
52 lines
1.3 KiB
Go
52 lines
1.3 KiB
Go
package redis
|
|
|
|
import (
|
|
"flag"
|
|
"os"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/docker/distribution/registry/storage/cache/cachecheck"
|
|
"github.com/garyburd/redigo/redis"
|
|
)
|
|
|
|
var redisAddr string
|
|
|
|
func init() {
|
|
flag.StringVar(&redisAddr, "test.registry.storage.cache.redis.addr", "", "configure the address of a test instance of redis")
|
|
}
|
|
|
|
// TestRedisLayerInfoCache exercises a live redis instance using the cache
|
|
// implementation.
|
|
func TestRedisBlobDescriptorCacheProvider(t *testing.T) {
|
|
if redisAddr == "" {
|
|
// fallback to an environement variable
|
|
redisAddr = os.Getenv("TEST_REGISTRY_STORAGE_CACHE_REDIS_ADDR")
|
|
}
|
|
|
|
if redisAddr == "" {
|
|
// skip if still not set
|
|
t.Skip("please set -registry.storage.cache.redis to test layer info cache against redis")
|
|
}
|
|
|
|
pool := &redis.Pool{
|
|
Dial: func() (redis.Conn, error) {
|
|
return redis.Dial("tcp", redisAddr)
|
|
},
|
|
MaxIdle: 1,
|
|
MaxActive: 2,
|
|
TestOnBorrow: func(c redis.Conn, t time.Time) error {
|
|
_, err := c.Do("PING")
|
|
return err
|
|
},
|
|
Wait: false, // if a connection is not avialable, proceed without cache.
|
|
}
|
|
|
|
// Clear the database
|
|
if _, err := pool.Get().Do("FLUSHDB"); err != nil {
|
|
t.Fatalf("unexpected error flushing redis db: %v", err)
|
|
}
|
|
|
|
cachecheck.CheckBlobDescriptorCache(t, NewRedisBlobDescriptorCacheProvider(pool))
|
|
}
|