Sharness: Add tests for ipfs repo stat --size-only

License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>
ipfs · May 9, 2018 · 6a47abb · 6a47abb
1 parent 31ebc6a
commit 6a47abb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/core/commands/repo.go b/core/commands/repo.go
@@ -178,7 +178,7 @@ Version         string The repo version.
 			statF = corerepo.RepoSize
 		}
 
-		stat, err := statF(n, req.Context)
+		stat, err := statF(req.Context, n)
 		if err != nil {
 			res.SetError(err, cmdkit.ErrNormal)
 			return

diff --git a/core/corerepo/stat.go b/core/corerepo/stat.go
@@ -12,6 +12,7 @@ import (
 	humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
 )
 
+// Stat wraps information about the objects stored on disk.
 type Stat struct {
 	RepoSize   uint64 // size in bytes
 	StorageMax uint64 // size in bytes
@@ -23,8 +24,9 @@ type Stat struct {
 // NoLimit represents the value for unlimited storage
 const NoLimit uint64 = math.MaxUint64
 
-func RepoStat(n *core.IpfsNode, ctx context.Context) (*Stat, error) {
-	sizeStat, err := RepoSize(n, ctx)
+// RepoStat returns a *Stat object with all the fields set.
+func RepoStat(ctx context.Context, n *core.IpfsNode) (*Stat, error) {
+	sizeStat, err := RepoSize(ctx, n)
 	if err != nil {
 		return nil, err
 	}
@@ -53,7 +55,8 @@ func RepoStat(n *core.IpfsNode, ctx context.Context) (*Stat, error) {
 	}, nil
 }
 
-func RepoSize(n *core.IpfsNode, ctx context.Context) (*Stat, error) {
+// RepoSize returns a *Stat object with the RepoSize and StorageMax fields set.
+func RepoSize(ctx context.Context, n *core.IpfsNode) (*Stat, error) {
 	r := n.Repo
 
 	cfg, err := r.Config()

diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh
@@ -245,6 +245,18 @@ test_expect_success "repo stats are updated correctly" '
   test $(get_field_num "RepoSize" repo-stats-2) -ge $(get_field_num "RepoSize" repo-stats)
 '
 
+test_expect_success "'ipfs repo stat --size-only' succeeds" '
+  ipfs repo stat --size-only > repo-stats-size-only
+'
+
+test_expect_success "repo stats came out correct for --size-only" '
+  grep "RepoSize" repo-stats-size-only &&
+  grep "StorageMax" repo-stats-size-only &&
+  grep -v "RepoPath" repo-stats-size-only &&
+  grep -v "NumObjects" repo-stats-size-only &&
+  grep -v "Version" repo-stats-size-only &&
+'
+
 test_expect_success "'ipfs repo version' succeeds" '
   ipfs repo version > repo-version
 '