johanels/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-12-12 06:24:14 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

cmd/gitannex: Simplify verbose failures in tests

Browse Source
This commit is contained in:
Dan McArdle
2024-08-04 20:28:46 -04:00
committed by Nick Craig-Wood
parent be33e281b3
commit 325f400a88
2 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/gitannex/e2e_test.go
View File

@@ -31,9 +31,7 @@ func checkRcloneBinaryVersion(t *testing.T) error {
cmd := exec.Command("rclone", "rc", "--loopback", "core/version") cmd := exec.Command("rclone", "rc", "--loopback", "core/version")
stdout, err := cmd.Output() stdout, err := cmd.Output()
if err != nil { require.NoError(t, err)
return fmt.Errorf("failed to get rclone version: %w", err)
}
var parsed versionInfo var parsed versionInfo
if err := json.Unmarshal(stdout, &parsed); err != nil { if err := json.Unmarshal(stdout, &parsed); err != nil {

25
cmd/gitannex/gitannex_test.go
View File

@@ -456,10 +456,7 @@ var fstestTestCases = []testCase{
h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension
h.requireReadLineExact("EXTENSIONS") h.requireReadLineExact("EXTENSIONS")
if !h.server.extensionInfo { require.True(t, h.server.extensionInfo)
t.Errorf("expected INFO extension to be enabled")
return
}
h.requireWriteLine("PREPARE") h.requireWriteLine("PREPARE")
h.requireReadLineExact("GETCONFIG rcloneremotename") h.requireReadLineExact("GETCONFIG rcloneremotename")
@@ -484,10 +481,7 @@ var fstestTestCases = []testCase{
h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension
h.requireReadLineExact("EXTENSIONS") h.requireReadLineExact("EXTENSIONS")
if !h.server.extensionInfo { require.True(t, h.server.extensionInfo)
t.Errorf("expected INFO extension to be enabled")
return
}
h.requireWriteLine("PREPARE") h.requireWriteLine("PREPARE")
h.requireReadLineExact("GETCONFIG rcloneremotename") h.requireReadLineExact("GETCONFIG rcloneremotename")
@@ -516,10 +510,7 @@ var fstestTestCases = []testCase{
h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension
h.requireReadLineExact("EXTENSIONS") h.requireReadLineExact("EXTENSIONS")
if !h.server.extensionInfo { require.True(t, h.server.extensionInfo)
t.Errorf("expected INFO extension to be enabled")
return
}
h.requireWriteLine("PREPARE") h.requireWriteLine("PREPARE")
h.requireReadLineExact("GETCONFIG rcloneremotename") h.requireReadLineExact("GETCONFIG rcloneremotename")
@@ -552,10 +543,7 @@ var fstestTestCases = []testCase{
h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension
h.requireReadLineExact("EXTENSIONS") h.requireReadLineExact("EXTENSIONS")
if !h.server.extensionInfo { require.True(t, h.server.extensionInfo)
t.Errorf("expected INFO extension to be enabled")
return
}
h.requireWriteLine("PREPARE") h.requireWriteLine("PREPARE")
h.requireReadLineExact("GETCONFIG rcloneremotename") h.requireReadLineExact("GETCONFIG rcloneremotename")
@@ -584,10 +572,7 @@ var fstestTestCases = []testCase{
h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension h.requireWriteLine("EXTENSIONS INFO") // Advertise that we support the INFO extension
h.requireReadLineExact("EXTENSIONS") h.requireReadLineExact("EXTENSIONS")
if !h.server.extensionInfo { require.True(t, h.server.extensionInfo)
t.Errorf("expected INFO extension to be enabled")
return
}
h.requireWriteLine("PREPARE") h.requireWriteLine("PREPARE")
h.requireReadLineExact("GETCONFIG rcloneremotename") h.requireReadLineExact("GETCONFIG rcloneremotename")