More cwd

macadmins · May 22, 2024 · a0c0f19 · a0c0f19
1 parent deeab84
commit a0c0f19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/tables/sofa/BUILD.bazel b/tables/sofa/BUILD.bazel
@@ -25,10 +25,6 @@ go_test(
         "sofa_info_test.go",
     ],
     embed = [":sofa"],
-    embedsrcs = [
-        "test_data.json",
-        "test_etag.txt",
-    ],
     deps = [
         "//pkg/utils",
         "@com_github_stretchr_testify//assert",

diff --git a/tables/sofa/client_test.go b/tables/sofa/client_test.go
@@ -285,26 +285,34 @@ func TestDownloadData(t *testing.T) {
 }
 
 func TestNewSofaClient(t *testing.T) {
-	client, err := NewSofaClient()
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	client, err := NewSofaClient(WithCacheDir(cwd))
 	assert.NoError(t, err)
 	assert.Equal(t, SofaV1URL, client.endpoint)
 	assert.NotNil(t, client.httpClient)
 }
 
 func TestWithHTTPClient(t *testing.T) {
-	client, err := NewSofaClient(WithHTTPClient(&http.Client{}))
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	client, err := NewSofaClient(WithHTTPClient(&http.Client{}), WithCacheDir(cwd))
 	assert.NoError(t, err)
 	assert.NotNil(t, client.httpClient)
 }
 
 func TestWithEndpoint(t *testing.T) {
-	client, err := NewSofaClient(WithURL("http://example.com"))
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	client, err := NewSofaClient(WithURL("http://example.com"), WithCacheDir(cwd)
 	assert.NoError(t, err)
 	assert.Equal(t, "http://example.com", client.endpoint)
 }
 
 func TestSetCachePaths(t *testing.T) {
-	client, err := NewSofaClient()
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	client, err := NewSofaClient(WiWithCacheDir(cwd))
 	assert.NoError(t, err)
 
 	client.setCachePaths()
@@ -326,7 +334,9 @@ func TestWithCacheDir(t *testing.T) {
 }
 
 func TestEtagPath(t *testing.T) {
-	client, err := NewSofaClient()
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	client, err := NewSofaClient(WWithCacheDir(cwd))
 	assert.NoError(t, err)
 
 	client.setCachePaths()
@@ -335,7 +345,9 @@ func TestEtagPath(t *testing.T) {
 }
 
 func TestCreateCacheDir(t *testing.T) {
-	client, err := NewSofaClient()
+	cwd, err := os.Getwd()
+	assert.NoError(t, err)
+	client, err := NewSofaClient(WiWithCacheDir(cwd))
 	assert.NoError(t, err)
 
 	err = client.createCacheDir()