cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sharness test, dont print metadata in cmd

Browse Source
This commit is contained in:
Kishan Mohanbhai Sagathiya 2019-08-27 09:32:34 +05:30
parent 7b35524779
commit cd86211766
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/ipfs-cluster-ctl/formatters.go
View File

@ -190,16 +190,12 @@ func textFormatPrintPin(obj *api.Pin) {
fmt.Printf(" | %s", recStr)
if len(obj.Metadata) == 0 {
fmt.Printf("\n")
return
}
fmt.Printf(" | Metadata:")
for k, v := range obj.Metadata {
fmt.Printf(" %s=%s, ", k, v)
if len(obj.Metadata) == 0 {
fmt.Printf(" no\n")
} else {
fmt.Printf(" yes\n")
}
fmt.Printf("\n")
}
func textFormatPrintAddedOutput(obj *api.AddedOutput) {

2
cmd/ipfs-cluster-ctl/main.go
View File

@ -1081,7 +1081,7 @@ func waitFor(
func parseMetadata(metadata []string) map[string]string {
metadataMap := make(map[string]string)
for _, str := range metadata {
parts := strings.Split(str, "=")
parts := strings.SplitN(str, "=", 2)
if len(parts) != 2 {
checkErr("parsing metadata", errors.New("metadata were not in the format key=value"))
}

10
sharness/t0030-ctl-pin.sh
View File

@ -96,6 +96,16 @@ test_expect_success IPFS,CLUSTER "pin update a pin" '
ipfs-cluster-ctl pin ls $cid2
'
test_expect_success IPFS,CLUSTER "pin with metadata" '
cid3=`docker exec ipfs sh -c "echo test3 | ipfs add -q"`
ipfs-cluster-ctl pin add --metadata kind=text "$cid3"
cid4=`docker exec ipfs sh -c "echo test4 | ipfs add -q"`
ipfs-cluster-ctl pin add "$cid4"
ipfs-cluster-ctl pin ls "$cid3" | grep -q "Metadata: yes" &&
ipfs-cluster-ctl --enc=json pin ls "$cid3" | jq .metadata | grep -q "\"kind\": \"text\"" &&
ipfs-cluster-ctl pin ls "$cid4" | grep -q "Metadata: no"
'
test_clean_ipfs
test_clean_cluster