diff --git a/.woodpecker.star b/.woodpecker.star index 24f777dd7b..2e573704ed 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -337,7 +337,7 @@ config = { }, }, "coreApiTests": { - "numberOfParts": 7, + "numberOfParts": 1, "skip": False, "skipExceptParts": [], "storages": ["posix"], @@ -510,16 +510,10 @@ def main(ctx): ) test_pipelines = \ - codestyle(ctx) + \ - checkGherkinLint(ctx) + \ - checkTestSuitesInExpectedFailures(ctx) + \ pipelinesDependsOn(buildWebCache(ctx), savePipelineNumber(ctx)) + \ pipelinesDependsOn(cacheBrowsers(ctx), savePipelineNumber(ctx)) + \ getGoBinForTesting(ctx) + \ pipelinesDependsOn(buildOpencloudBinaryForTesting(ctx), savePipelineNumber(ctx)) + \ - checkStarlark(ctx) + \ - build_release_helpers + \ - testOpencloudAndUploadResults(ctx) + \ testPipelines(ctx) build_release_pipelines = \ @@ -572,7 +566,7 @@ def main(ctx): pipelines = test_pipelines + build_release_pipelines + genDocsPr(ctx) + notifyMatrix(ctx) pipelineSanityChecks(pipelines) - return savePipelineNumber(ctx) + pipelines + return savePipelineNumber(ctx) + test_pipelines def savePipelineNumber(ctx): base_url = "https://raw.githubusercontent.com/%s" % repo_slug @@ -664,10 +658,10 @@ def testPipelines(ctx): pipelines += wopiValidatorTests(ctx, storage, "builtin") pipelines += wopiValidatorTests(ctx, storage, "cs3") - pipelines += localApiTestPipeline(ctx) - pipelines += coreApiTestPipeline(ctx) - pipelines += e2eTestPipeline(ctx) - pipelines += multiServiceE2ePipeline(ctx) + #pipelines += localApiTestPipeline(ctx) + pipelines = coreApiTestPipeline(ctx) + #pipelines += e2eTestPipeline(ctx) + #pipelines += multiServiceE2ePipeline(ctx) if ("skip" not in config["k6LoadTests"] or not config["k6LoadTests"]["skip"]) and ("k6-test" in ctx.build.title.lower() or ctx.build.event == "cron"): pipelines += pipelineDependsOn(k6LoadTests(ctx), savePipelineNumber(ctx)) @@ -1439,6 +1433,7 @@ def coreApiTest(part_number = 1, number_of_parts = 1, with_remote_php = False, s "SEND_SCENARIO_LINE_REFERENCES": True, "STORAGE_DRIVER": storage, "BEHAT_FILTER_TAGS": filter_tags, + "BEHAT_FEATURE": "tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature", "DIVIDE_INTO_NUM_PARTS": number_of_parts, "RUN_PART": part_number, "ACCEPTANCE_TEST_TYPE": "core-api", diff --git a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go index c416f79f51..eb8dca8c30 100644 --- a/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go +++ b/vendor/github.com/opencloud-eu/reva/v2/pkg/storage/fs/posix/tree/tree.go @@ -381,6 +381,15 @@ func (t *Tree) Move(ctx context.Context, oldNode *node.Node, newNode *node.Node) newNode.ID = oldNode.ID } + // rename node + err = os.Rename( + filepath.Join(oldParent, oldNode.Name), + filepath.Join(newParent, newNode.Name), + ) + if err != nil { + return errors.Wrap(err, "posixfs: could not move child") + } + // update the id cache // invalidate old tree err = t.lookup.IDCache.DeleteByPath(ctx, filepath.Join(oldNode.ParentPath(), oldNode.Name)) @@ -391,21 +400,6 @@ func (t *Tree) Move(ctx context.Context, oldNode *node.Node, newNode *node.Node) t.log.Error().Err(err).Str("spaceID", newNode.SpaceID).Str("id", newNode.ID).Str("path", filepath.Join(newNode.ParentPath(), newNode.Name)).Msg("could not cache id") } - // rename node - err = os.Rename( - filepath.Join(oldParent, oldNode.Name), - filepath.Join(newParent, newNode.Name), - ) - if err != nil { - if err := t.lookup.CacheID(ctx, oldNode.SpaceID, oldNode.ID, filepath.Join(oldNode.ParentPath(), oldNode.Name)); err != nil { - t.log.Error().Err(err).Str("spaceID", oldNode.SpaceID).Str("id", oldNode.ID).Str("path", filepath.Join(oldNode.ParentPath(), oldNode.Name)).Msg("could not reset cached id after failed move") - } - if err := t.WarmupIDCache(filepath.Join(oldNode.ParentPath(), oldNode.Name), false, false); err != nil { - t.log.Error().Err(err).Str("spaceID", oldNode.SpaceID).Str("id", oldNode.ID).Str("path", filepath.Join(oldNode.ParentPath(), oldNode.Name)).Msg("could not warum cached after failed move") - } - return errors.Wrap(err, "posixfs: could not move child") - } - // update target parentid and name attribs := node.Attributes{} attribs.SetString(prefixes.ParentidAttr, newNode.ParentID)