Skip to content

Commit

Permalink
Merge pull request #11068 from owncloud/test/minor-fixes
Browse files Browse the repository at this point in the history
[tests-only][full-ci] chore: add issue tag and fix env config value checks
  • Loading branch information
saw-jan authored Feb 28, 2025
2 parents 262846b + 867bd57 commit 6637e13
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tests/acceptance/features/apiOcm/share.feature
Original file line number Diff line number Diff line change
Expand Up @@ -1065,8 +1065,8 @@ Feature: an user shares resources using ScienceMesh application
}
"""

@issue-9926
Scenario: federated user tries to update a shared file after local user updates role
@issue-9926 @issue-11022
Scenario: federated user updates a shared file after sharer has updated the role
Given using server "LOCAL"
And user "Alice" has uploaded file with content "ocm test" to "/textfile.txt"
And user "Alice" has sent the following resource share invitation to federated user:
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/lint-expected-failures.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

log_error() {
if [ -n "${PLAIN_OUTPUT}" ]
if [ -n "${PLAIN_OUTPUT}" ] && [ "${PLAIN_OUTPUT}" == "true" ]
then
echo -e "$1"
else
Expand All @@ -10,7 +10,7 @@ log_error() {
}

log_info() {
if [ -n "${PLAIN_OUTPUT}" ]
if [ -n "${PLAIN_OUTPUT}" ] && [ "${PLAIN_OUTPUT}" == "true" ]
then
echo -e "$1"
else
Expand All @@ -19,7 +19,7 @@ log_info() {
}

log_success() {
if [ -n "${PLAIN_OUTPUT}" ]
if [ -n "${PLAIN_OUTPUT}" ] && [ "${PLAIN_OUTPUT}" == "true" ]
then
echo -e "$1"
else
Expand Down
7 changes: 4 additions & 3 deletions tests/acceptance/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ else
fi
BEHAT_TAGS_OPTION_FOUND=false

if [ -n "${STEP_THROUGH}" ]
if [ -n "${STEP_THROUGH}" ] && [ "${STEP_THROUGH}" == "true" ]
then
STEP_THROUGH_OPTION="--step-through"
fi

if [ -n "${STOP_ON_FAILURE}" ]
if [ -n "${STOP_ON_FAILURE}" ] && [ "${STOP_ON_FAILURE}" == "true" ]
then
STOP_OPTION="--stop-on-failure"
fi

if [ -n "${PLAIN_OUTPUT}" ]
if [ -n "${PLAIN_OUTPUT}" ] && [ "${PLAIN_OUTPUT}" == "true" ]
then
# explicitly tell Behat to not do colored output
COLORS_OPTION="--no-colors"
Expand Down Expand Up @@ -670,6 +670,7 @@ fi

# # If we are running in drone CI, then sleep for a bit to (hopefully) let the
# # drone agent send all the output to the drone server.
# NOTE: Not using this anymore, please enable it if needed
# if [ -n "${CI_REPO}" ]
# then
# echo "sleeping for 30 seconds at end of test run"
Expand Down

0 comments on commit 6637e13

Please sign in to comment.