Nonfunctional (#10753)
* fix typos * fix func name in docstring * use t.TempDir instead of os.MkdirTemp * fix typo * unique option names (cherry picked from commit 095cc0d731e3addfc2b7505763dee7a67ba895ab)
Andrew Gillis committed
Mar 11, 2025 at 14:04 UTC
e89d86b82407ff92c87cbb570f3a26045180310d
5 files changed
+13
-15
config/bootstrap_peers.go
+1
-1
@@ -47,7 +47,7 @@ func (c *Config) SetBootstrapPeers(bps []peer.AddrInfo) {
47
c.Bootstrap = BootstrapPeerStrings(bps)
48
}
49
50
-// ParseBootstrapPeer parses a bootstrap list into a list of AddrInfos.
50
+// ParseBootstrapPeers parses a bootstrap list into a list of AddrInfos.
51
func ParseBootstrapPeers(addrs []string) ([]peer.AddrInfo, error) {
52
maddrs := make([]ma.Multiaddr, len(addrs))
53
for i, addr := range addrs {
core/commands/cid.go
+3
-3
@@ -34,7 +34,7 @@ var CidCmd = &cmds.Command{
34
35
const (
36
cidFormatOptionName = "f"
37
- cidVerisonOptionName = "v"
37
+ cidToVersionOptionName = "v"
38
cidCodecOptionName = "mc"
39
cidMultibaseOptionName = "b"
40
)
@@ -53,13 +53,13 @@ The optional format string is a printf style format string:
53
},
54
Options: []cmds.Option{
55
cmds.StringOption(cidFormatOptionName, "Printf style format string.").WithDefault("%s"),
56
- cmds.StringOption(cidVerisonOptionName, "CID version to convert to."),
56
+ cmds.StringOption(cidToVersionOptionName, "CID version to convert to."),
57
cmds.StringOption(cidCodecOptionName, "CID multicodec to convert to."),
58
cmds.StringOption(cidMultibaseOptionName, "Multibase to display CID in."),
59
},
60
Run: func(req *cmds.Request, resp cmds.ResponseEmitter, env cmds.Environment) error {
61
fmtStr, _ := req.Options[cidFormatOptionName].(string)
62
- verStr, _ := req.Options[cidVerisonOptionName].(string)
62
+ verStr, _ := req.Options[cidToVersionOptionName].(string)
63
codecStr, _ := req.Options[cidCodecOptionName].(string)
64
baseStr, _ := req.Options[cidMultibaseOptionName].(string)
65
core/commands/cid_test.go
+2
-2
@@ -40,7 +40,7 @@ func TestCidFmtCmd(t *testing.T) {
40
// Mock request
41
req := &cmds.Request{
42
Options: map[string]interface{}{
43
- cidVerisonOptionName: "0",
43
+ cidToVersionOptionName: "0",
44
cidMultibaseOptionName: e.MultibaseName,
45
cidFormatOptionName: "%s",
46
},
@@ -91,7 +91,7 @@ func TestCidFmtCmd(t *testing.T) {
91
// Mock request
92
req := &cmds.Request{
93
Options: map[string]interface{}{
94
- cidVerisonOptionName: e.Ver,
94
+ cidToVersionOptionName: e.Ver,
95
cidMultibaseOptionName: e.MultibaseName,
96
cidFormatOptionName: "%s",
97
},
repo/fsrepo/migrations/setup_test.go
+6
-8
@@ -32,9 +32,10 @@ var (
32
)
33
34
func TestMain(m *testing.M) {
35
+ t := &testing.T{}
36
+
37
// Setup test data
36
- testDataDir := makeTestData()
37
- defer os.RemoveAll(testDataDir)
38
+ testDataDir := makeTestData(t)
39
40
testCar := makeTestCar(testDataDir)
41
defer os.RemoveAll(testCar)
@@ -47,18 +48,15 @@ func TestMain(m *testing.M) {
48
os.Exit(m.Run())
49
}
50
50
-func makeTestData() string {
51
- tempDir, err := os.MkdirTemp("", "kubo-migrations-test-*")
52
- if err != nil {
53
- panic(err)
54
- }
51
+func makeTestData(t testing.TB) string {
52
+ tempDir := t.TempDir()
53
54
versions := []string{"v1.0.0", "v1.1.0", "v1.1.2", "v2.0.0-rc1", "2.0.0", "v2.0.1"}
55
packages := []string{"kubo", "go-ipfs", "fs-repo-migrations", "fs-repo-1-to-2", "fs-repo-2-to-3", "fs-repo-9-to-10", "fs-repo-10-to-11"}
56
57
// Generate fake data
58
for _, name := range packages {
61
- err = os.MkdirAll(filepath.Join(tempDir, name), 0777)
59
+ err := os.MkdirAll(filepath.Join(tempDir, name), 0777)
60
if err != nil {
61
panic(err)
62
}
test/cli/files_test.go
+1
-1
@@ -65,7 +65,7 @@ func TestFilesCp(t *testing.T) {
65
// we manually changed codec from raw to dag-pb to test "bad dag-pb" scenario
66
cid := "bafybeic7pdbte5heh6u54vszezob3el6exadoiw4wc4ne7ny2x7kvajzkm"
67
68
- // should fail because node cant be read as a valid dag-pb
68
+ // should fail because node cannot be read as a valid dag-pb
69
cpResNoForce := node.RunIPFS("files", "cp", fmt.Sprintf("/ipfs/%s", cid), "/invalid-proto")
70
assert.NotEqual(t, 0, cpResNoForce.ExitErr.ExitCode())
71
assert.Contains(t, cpResNoForce.Stderr.String(), "Error")