refactor on some tests

This commit is contained in:
2021-11-30 16:19:45 +01:00
parent def2b0f2f0
commit 9b10052cd1
3 changed files with 15 additions and 12 deletions

View File

@ -19,7 +19,7 @@ import (
func buildContainer() testcontainers.ContainerRequest {
_, filename, _, _ := runtime.Caller(0)
dirname := filepath.Dir(filename)
dir := filepath.Dir(filename)
req := testcontainers.ContainerRequest{
FromDockerfile: testcontainers.FromDockerfile{
@ -38,10 +38,10 @@ func buildContainer() testcontainers.ContainerRequest {
ExposedPorts: []string{"8000:8000", "8001:8001"},
WaitingFor: wait.ForLog("Starting TLS server listening on :8001"),
BindMounts: map[string]string{
"/tmp/GeoIP2-City-Test.mmdb": filepath.Join(dirname, "/../test/GeoIP2-City-Test.mmdb"),
"/tmp/GeoLite2-ASN-Test.mmdb": filepath.Join(dirname, "/../test/GeoLite2-ASN-Test.mmdb"),
"/tmp/server.pem": filepath.Join(dirname, "/../test/server.pem"),
"/tmp/server.key": filepath.Join(dirname, "/../test/server.key"),
"/tmp/GeoIP2-City-Test.mmdb": filepath.Join(dir, "/../test/GeoIP2-City-Test.mmdb"),
"/tmp/GeoLite2-ASN-Test.mmdb": filepath.Join(dir, "/../test/GeoLite2-ASN-Test.mmdb"),
"/tmp/server.pem": filepath.Join(dir, "/../test/server.pem"),
"/tmp/server.key": filepath.Join(dir, "/../test/server.key"),
},
}