mirror of
https://github.com/minio/minio.git
synced 2025-04-01 02:03:42 -04:00
make sure to ignore expected errors and dirname deletes (#14945)
This commit is contained in:
parent
9aadd725d2
commit
30c9e50701
@ -28,6 +28,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@ -189,6 +190,9 @@ func (s *TestSuiteIAM) getUserClient(c *check, accessKey, secretKey, sessionToke
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestIAMInternalIDPServerSuite(t *testing.T) {
|
func TestIAMInternalIDPServerSuite(t *testing.T) {
|
||||||
|
if runtime.GOOS == globalWindowsOSName {
|
||||||
|
t.Skip("windows is clunky disable these tests")
|
||||||
|
}
|
||||||
for i, testCase := range iamTestSuites {
|
for i, testCase := range iamTestSuites {
|
||||||
t.Run(
|
t.Run(
|
||||||
fmt.Sprintf("Test: %d, ServerType: %s", i+1, testCase.ServerTypeDescription),
|
fmt.Sprintf("Test: %d, ServerType: %s", i+1, testCase.ServerTypeDescription),
|
||||||
|
@ -699,6 +699,10 @@ func (z *erasureServerPools) decommissionPool(ctx context.Context, idx int, pool
|
|||||||
ObjectOptions{
|
ObjectOptions{
|
||||||
VersionID: version.VersionID,
|
VersionID: version.VersionID,
|
||||||
})
|
})
|
||||||
|
if isErrObjectNotFound(err) {
|
||||||
|
// object deleted by the application, nothing to do here we move on.
|
||||||
|
return
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
failure = true
|
failure = true
|
||||||
logger.LogIf(ctx, err)
|
logger.LogIf(ctx, err)
|
||||||
@ -725,7 +729,7 @@ func (z *erasureServerPools) decommissionPool(ctx context.Context, idx int, pool
|
|||||||
if decommissionedCount == len(fivs.Versions) {
|
if decommissionedCount == len(fivs.Versions) {
|
||||||
_, err := set.DeleteObject(ctx,
|
_, err := set.DeleteObject(ctx,
|
||||||
bName,
|
bName,
|
||||||
entry.name,
|
encodeDirObject(entry.name),
|
||||||
ObjectOptions{
|
ObjectOptions{
|
||||||
DeletePrefix: true, // use prefix delete to delete all versions at once.
|
DeletePrefix: true, // use prefix delete to delete all versions at once.
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user