Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 11 additions & 19 deletions gradlecache/gradlecache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -862,25 +862,24 @@ func TestSaveDeltaDefaultsProjectDirToWorkingDirectory(t *testing.T) {
}
}

func TestSaveDeltaErrorsWhenProjectDirHasNoDotGradle(t *testing.T) {
func TestSaveDeltaErrorsWhenProjectDirDoesNotExist(t *testing.T) {
ctx := context.Background()
gradleHome := t.TempDir()
must(t, os.MkdirAll(filepath.Join(gradleHome, "caches"), 0o755))
must(t, touchMarkerFile(filepath.Join(gradleHome, ".cache-restore-marker")))

projectDir := t.TempDir()
err := SaveDelta(ctx, SaveDeltaConfig{
CachewURL: "http://example.invalid",
CacheKey: "test-cache",
Branch: "feature/test",
GradleUserHome: gradleHome,
ProjectDir: projectDir,
ProjectDir: filepath.Join(t.TempDir(), "does-not-exist"),
})
if err == nil {
t.Fatal("expected SaveDelta to fail when project dir has no .gradle directory")
t.Fatal("expected SaveDelta to fail when project dir does not exist")
}
if !strings.Contains(err.Error(), "missing .gradle/") {
t.Fatalf("expected missing .gradle error, got %v", err)
if !strings.Contains(err.Error(), "does not exist") {
t.Fatalf("expected 'does not exist' error, got %v", err)
}
}

Expand Down Expand Up @@ -926,31 +925,24 @@ func TestSaveDeltaReturnsMarkerStatErrors(t *testing.T) {
}
}

func TestSaveErrorsWhenWorkingDirectoryHasNoDotGradle(t *testing.T) {
func TestSaveErrorsWhenProjectDirDoesNotExist(t *testing.T) {
ctx := context.Background()
gradleHome := t.TempDir()
must(t, os.MkdirAll(filepath.Join(gradleHome, "caches"), 0o755))

projectDir := t.TempDir()
origWD, err := os.Getwd()
must(t, err)
must(t, os.Chdir(projectDir))
defer func() {
must(t, os.Chdir(origWD))
}()

err = Save(ctx, SaveConfig{
err := Save(ctx, SaveConfig{
CachewURL: "http://example.invalid",
CacheKey: "test-cache",
Commit: strings.Repeat("a", 40),
GradleUserHome: gradleHome,
ProjectDir: filepath.Join(t.TempDir(), "does-not-exist"),
SkipWarm: true,
})
if err == nil {
t.Fatal("expected Save to fail when working directory has no .gradle directory")
t.Fatal("expected Save to fail when project dir does not exist")
}
if !strings.Contains(err.Error(), "missing .gradle/") {
t.Fatalf("expected missing .gradle error, got %v", err)
if !strings.Contains(err.Error(), "does not exist") {
t.Fatalf("expected 'does not exist' error, got %v", err)
}
}

Expand Down
7 changes: 3 additions & 4 deletions gradlecache/save.go
Original file line number Diff line number Diff line change
Expand Up @@ -1045,13 +1045,12 @@ func validateProjectDir(projectDir string) error {
if projectDir == "" {
return errors.New("project directory is required")
}
dotGradle := filepath.Join(projectDir, ".gradle")
info, err := os.Stat(dotGradle)
info, err := os.Stat(projectDir)
if err != nil {
return errors.Errorf("project directory %q is missing .gradle/: %w", projectDir, err)
return errors.Errorf("project directory %q does not exist: %w", projectDir, err)
}
if !info.IsDir() {
return errors.Errorf("project directory %q has non-directory .gradle path", projectDir)
return errors.Errorf("project directory %q is not a directory", projectDir)
}
return nil
}
Expand Down
Loading