Skip to content

Commit

Permalink
Merge pull request #151 from vbatts/clean.00
Browse files Browse the repository at this point in the history
check: remove unused TarCheck(), for Compare()
  • Loading branch information
vbatts committed Dec 10, 2018
2 parents abf4d54 + 40f4ce8 commit 53e54ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
10 changes: 0 additions & 10 deletions check.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,3 @@ func Check(root string, dh *DirectoryHierarchy, keywords []Keyword, fs FsEval) (

return Compare(dh, newDh, keywords)
}

// TarCheck is the tar equivalent of checking a file hierarchy spec against a
// tar stream to determine if files have been changed. This is precisely
// equivalent to Compare(dh, tarDH, keywords).
func TarCheck(tarDH, dh *DirectoryHierarchy, keywords []Keyword) ([]InodeDelta, error) {
if keywords == nil {
return Compare(dh, tarDH, dh.UsedKeywords())
}
return Compare(dh, tarDH, keywords)
}
8 changes: 4 additions & 4 deletions tar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func TestTar(t *testing.T) {
t.Fatal(err)
}

res, err := TarCheck(tdh, dh, append(DefaultKeywords, "sha1"))
res, err := Compare(tdh, dh, append(DefaultKeywords, "sha1"))
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -164,7 +164,7 @@ func TestArchiveCreation(t *testing.T) {
}

// Test the tar manifest against itself
res, err = TarCheck(tdh, tdh, []Keyword{"sha1"})
res, err = Compare(tdh, tdh, []Keyword{"sha1"})
if err != nil {
t.Fatal(err)
}
Expand All @@ -180,7 +180,7 @@ func TestArchiveCreation(t *testing.T) {
if err != nil {
t.Fatal(err)
}
res, err = TarCheck(tdh, dh, []Keyword{"sha1"})
res, err = Compare(tdh, dh, []Keyword{"sha1"})
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -218,7 +218,7 @@ func TestTreeTraversal(t *testing.T) {
t.Fatal(err)
}

res, err := TarCheck(tdh, tdh, []Keyword{"sha1"})
res, err := Compare(tdh, tdh, []Keyword{"sha1"})
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit 53e54ea

Please sign in to comment.