Skip to content

Commit

Permalink
Fix more tests, 53 still failing
Browse files Browse the repository at this point in the history
  • Loading branch information
@gsergey418alt
gsergey418alt committed Jan 28, 2025
1 parent 42692c6 commit f589555
Show file tree
Hide file tree
Showing 2 changed files with 177 additions and 34 deletions.
148 changes: 148 additions & 0 deletions test/sharness/actual
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"API": {
"HTTPHeaders": {}
},
"Addresses": {
"API": "/ip4/127.0.0.1/tcp/5001",
"Announce": [],
"AppendAnnounce": [],
"Gateway": "/ip4/127.0.0.1/tcp/8080",
"NoAnnounce": [],
"Swarm": [
"/ip4/0.0.0.0/tcp/4001",
"/ip6/::/tcp/4001",
"/ip4/0.0.0.0/udp/4001/webrtc-direct",
"/ip4/0.0.0.0/udp/4001/quic-v1",
"/ip4/0.0.0.0/udp/4001/quic-v1/webtransport",
"/ip6/::/udp/4001/webrtc-direct",
"/ip6/::/udp/4001/quic-v1",
"/ip6/::/udp/4001/quic-v1/webtransport"
]
},
"AutoNAT": {},
"AutoTLS": {},
"Bootstrap": null,
"DNS": {
"Resolvers": {}
},
"Datastore": {
"BlockKeyCacheSize": null,
"BloomFilterSize": 0,
"GCPeriod": "1h",
"HashOnRead": false,
"Spec": {
"mounts": [
{
"child": {
"path": "blocks",
"shardFunc": "/repo/flatfs/shard/v1/next-to-last/2",
"sync": false,
"type": "flatfs"
},
"mountpoint": "/blocks",
"prefix": "flatfs.datastore",
"type": "measure"
},
{
"child": {
"compression": "none",
"path": "datastore",
"type": "levelds"
},
"mountpoint": "/",
"prefix": "leveldb.datastore",
"type": "measure"
}
],
"type": "mount"
},
"StorageGCWatermark": 90,
"StorageMax": "10GB"
},
"Discovery": {
"MDNS": {
"Enabled": true
}
},
"Experimental": {
"FilestoreEnabled": false,
"Libp2pStreamMounting": false,
"OptimisticProvide": false,
"OptimisticProvideJobsPoolSize": 0,
"P2pHttpProxy": false,
"StrategicProviding": false,
"UrlstoreEnabled": false
},
"Gateway": {
"DeserializedResponses": null,
"DisableHTMLErrors": null,
"ExposeRoutingAPI": null,
"HTTPHeaders": {},
"NoDNSLink": false,
"NoFetch": false,
"PublicGateways": null,
"RootRedirect": ""
},
"Identity": {
"PeerID": "12D3KooWKr2Z9EN4jg1kzxzb8dtn21U7HFMEU1SCPawMavyH1vhR"
},
"Import": {
"BatchMaxNodes": null,
"BatchMaxSize": null,
"CidVersion": null,
"HashFunction": null,
"UnixFSChunker": null,
"UnixFSRawLeaves": null
},
"Internal": {},
"Ipns": {
"RecordLifetime": "",
"RepublishPeriod": "",
"ResolveCacheSize": 128
},
"Migration": {
"DownloadSources": [],
"Keep": ""
},
"Mounts": {
"FuseAllowOther": false,
"IPFS": "/ipfs",
"IPNS": "/ipns"
},
"Peering": {
"Peers": null
},
"Pinning": {
"RemoteServices": {}
},
"Plugins": {
"Plugins": null
},
"Provider": {
"Strategy": ""
},
"Pubsub": {
"DisableSigning": false,
"Router": ""
},
"Reprovider": {},
"Routing": {
"Methods": null,
"Routers": null
},
"Swarm": {
"AddrFilters": null,
"ConnMgr": {},
"DisableBandwidthMetrics": false,
"DisableNatPortMap": false,
"RelayClient": {},
"RelayService": {},
"ResourceMgr": {},
"Transports": {
"Multiplexers": {},
"Network": {},
"Security": {}
}
},
"Version": {}
}
63 changes: 29 additions & 34 deletions test/sharness/t0021-config.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,35 @@ test_config_cmd_set() {

cfg_key=$1
cfg_val=$2
test_expect_success "ipfs config succeeds" '
ipfs config $cfg_flags "$cfg_key" "$cfg_val"
'
test_expect_success "ipfs config succeeds" "
ipfs config $cfg_flags \"$cfg_key\" \"$cfg_val\"
"

test_expect_success "ipfs config output looks good" '
echo "$cfg_val" >expected &&
ipfs config "$cfg_key" >actual &&
test_expect_success "ipfs config output looks good" "
echo \"$cfg_val\" >expected &&
ipfs config \"$cfg_key\" >actual &&
test_cmp expected actual
'
"

# also test our lib function. it should work too.
cfg_key="Lib.$cfg_key"
test_expect_success "test_config_set succeeds" '
test_config_set $cfg_flags "$cfg_key" "$cfg_val"
'
test_expect_success "test_config_set succeeds" "
test_config_set $cfg_flags \"$cfg_key\" \"$cfg_val\"
"

test_expect_success "test_config_set value looks good" '
echo "$cfg_val" >expected &&
ipfs config "$cfg_key" >actual &&
test_expect_success "test_config_set value looks good" "
echo \"$cfg_val\" >expected &&
ipfs config \"$cfg_key\" >actual &&
test_cmp expected actual
'
"
}

# this is a bit brittle. the problem is we need to test
# with something that will be forced to unmarshal as a struct.
# (i.e. just setting 'ipfs config --json foo "[1, 2, 3]"') may
# set it as astring instead of proper json. We leverage the
# unmarshalling that has to happen.
CONFIG_SET_JSON_TEST='{
"MDNS": {
"Enabled": true,
"Interval": 10
}
}'
CONFIG_SET_JSON_TEST='{"MDNS":{"Enabled":true}}'

test_profile_apply_revert() {
profile=$1
Expand Down Expand Up @@ -87,27 +82,27 @@ test_profile_apply_dry_run_not_alter() {
}

test_config_cmd() {
test_config_cmd_set "beep" "boop"
test_config_cmd_set "beep1" "boop2"
test_config_cmd_set "beep1" "boop2"
test_config_cmd_set "--bool" "beep2" "true"
test_config_cmd_set "--bool" "beep2" "false"
test_config_cmd_set "--json" "beep3" "true"
test_config_cmd_set "--json" "beep3" "false"
test_config_cmd_set "Addresses.API" "foo"
test_config_cmd_set "Addresses.Gateway" "bar"
test_config_cmd_set "Datastore.GCPeriod" "baz"
test_config_cmd_set "--bool" "Discovery.MDNS.Enabled" "true"
test_config_cmd_set "--bool" "Discovery.MDNS.Enabled" "false"
test_config_cmd_set "--json" "Datastore.HashOnRead" "true"
test_config_cmd_set "--json" "Datastore.HashOnRead" "false"
test_config_cmd_set "--json" "Discovery" "$CONFIG_SET_JSON_TEST"
test_config_cmd_set "--json" "deep-not-defined.prop" "true"
test_config_cmd_set "--json" "deep-null" "null"
test_config_cmd_set "--json" "deep-null.prop" "true"
test_config_cmd_set "--json" "Experimental.FilestoreEnabled" "true"
test_config_cmd_set "--json" "Import.BatchMaxSize" "null"
test_config_cmd_set "--json" "Datastore.Spec" "true"

test_expect_success "'ipfs config show' works" '
ipfs config show >actual
'

test_expect_success "'ipfs config show' output looks good" '
grep "\"beep\": \"boop\"," actual &&
grep "\"beep1\": \"boop2\"," actual &&
grep "\"beep2\": false," actual &&
grep "\"beep3\": false," actual
grep "\"API\": \"foo\"," actual &&
grep "\"Gateway\": \"bar\"" actual &&
grep "\"Enabled\": false" actual &&
grep "\"HashOnRead\": false" actual
'

test_expect_success "'ipfs config show --config-file' works" '
Expand Down

0 comments on commit f589555

Please sign in to comment.