diff options
author | Joas Schilling <coding@schilljs.com> | 2021-03-25 15:18:59 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2021-03-25 15:18:59 +0100 |
commit | 23214303c408c4192f3d8694fce9cea2e3b3544f (patch) | |
tree | 6e776dc8feef38c780bcd7cd6ea746a2efda9108 | |
parent | e3c828631eeffa725786225e4ee304bdd796274d (diff) |
Split conversation integration tests into 2 folders
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | .drone.yml | 130 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/one-to-one.feature (renamed from tests/integration/features/conversation/one-to-one.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/password-request.feature (renamed from tests/integration/features/conversation/password-request.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/promotion-demotion.feature (renamed from tests/integration/features/conversation/promotion-demotion.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/public-private.feature (renamed from tests/integration/features/conversation/public-private.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/remove-participant.feature (renamed from tests/integration/features/conversation/remove-participant.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/remove-self.feature (renamed from tests/integration/features/conversation/remove-self.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/rename-room.feature (renamed from tests/integration/features/conversation/rename-room.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/set-description.feature (renamed from tests/integration/features/conversation/set-description.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/set-listable.feature (renamed from tests/integration/features/conversation/set-listable.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/set-password.feature (renamed from tests/integration/features/conversation/set-password.feature) | 0 | ||||
-rw-r--r-- | tests/integration/features/conversation-2/sip-dialin.feature (renamed from tests/integration/features/conversation/sip-dialin.feature) | 0 |
12 files changed, 130 insertions, 0 deletions
diff --git a/.drone.yml b/.drone.yml index 3402c5ed2..8698c76ba 100644 --- a/.drone.yml +++ b/.drone.yml @@ -141,6 +141,43 @@ trigger: --- kind: pipeline +name: int-sqlite-conversation-2 + +steps: + - name: integration-conversation-2 + image: nextcloudci/php7.3:php7.3-5 + environment: + APP_NAME: spreed + CORE_BRANCH: master + GUESTS_BRANCH: master + DATABASEHOST: sqlite + commands: + - bash tests/drone-run-integration-tests.sh || exit 0 + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST + - cd ../server + - git clone --depth 1 -b "$GUESTS_BRANCH" https://github.com/nextcloud/guests apps/guests + - ./occ app:enable $APP_NAME + - cd apps/$APP_NAME + + # Run integration tests + - cd tests/integration/ + - bash run.sh features/conversation-2 + +services: + - name: cache + image: redis + +trigger: + branch: + - master + - stable* + event: + - pull_request + - push + +--- +kind: pipeline name: int-sqlite-sharing steps: @@ -358,6 +395,53 @@ trigger: --- kind: pipeline +name: int-mysql-conversation-2 + +steps: + - name: integration-conversation-2 + image: nextcloudci/php7.3:php7.3-5 + environment: + APP_NAME: spreed + CORE_BRANCH: master + GUESTS_BRANCH: master + DATABASEHOST: mysql + commands: + - bash tests/drone-run-integration-tests.sh || exit 0 + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST + - cd ../server + - git clone --depth 1 -b "$GUESTS_BRANCH" https://github.com/nextcloud/guests apps/guests + - ./occ app:enable $APP_NAME + - cd apps/$APP_NAME + + # Run integration tests + - cd tests/integration/ + - bash run.sh features/conversation-2 + +services: + - name: cache + image: redis + - name: mysql + image: mysql:5.7.22 + environment: + MYSQL_ROOT_PASSWORD: owncloud + MYSQL_USER: oc_autotest + MYSQL_PASSWORD: owncloud + MYSQL_DATABASE: oc_autotest + command: [ "--innodb_large_prefix=true", "--innodb_file_format=barracuda", "--innodb_file_per_table=true" ] + tmpfs: + - /var/lib/mysql + +trigger: + branch: + - master + - stable* + event: +# - pull_request + - push + +--- +kind: pipeline name: int-mysql-sharing steps: @@ -581,6 +665,52 @@ trigger: --- kind: pipeline +name: int-pgsql-conversation-2 + +steps: + - name: integration-conversation-2 + image: nextcloudci/php7.3:php7.3-5 + environment: + APP_NAME: spreed + CORE_BRANCH: master + GUESTS_BRANCH: master + DATABASEHOST: pgsql + commands: + - bash tests/drone-run-integration-tests.sh || exit 0 + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DATABASEHOST + - cd ../server + - git clone --depth 1 -b "$GUESTS_BRANCH" https://github.com/nextcloud/guests apps/guests + - ./occ app:enable $APP_NAME + - cd apps/$APP_NAME + + # Run integration tests + - cd tests/integration/ + - bash run.sh features/conversation-2 + +services: + - name: cache + image: redis + - name: pgsql + image: postgres:10 + environment: + POSTGRES_USER: oc_autotest + POSTGRES_DB: oc_autotest_dummy + POSTGRES_HOST_AUTH_METHOD: trust + POSTGRES_PASSWORD: + tmpfs: + - /var/lib/postgresql/data + +trigger: + branch: + - master + - stable* + event: +# - pull_request + - push + +--- +kind: pipeline name: int-pgsql-sharing steps: diff --git a/tests/integration/features/conversation/one-to-one.feature b/tests/integration/features/conversation-2/one-to-one.feature index 2a07265ae..2a07265ae 100644 --- a/tests/integration/features/conversation/one-to-one.feature +++ b/tests/integration/features/conversation-2/one-to-one.feature diff --git a/tests/integration/features/conversation/password-request.feature b/tests/integration/features/conversation-2/password-request.feature index 7f979ae34..7f979ae34 100644 --- a/tests/integration/features/conversation/password-request.feature +++ b/tests/integration/features/conversation-2/password-request.feature diff --git a/tests/integration/features/conversation/promotion-demotion.feature b/tests/integration/features/conversation-2/promotion-demotion.feature index d9623c550..d9623c550 100644 --- a/tests/integration/features/conversation/promotion-demotion.feature +++ b/tests/integration/features/conversation-2/promotion-demotion.feature diff --git a/tests/integration/features/conversation/public-private.feature b/tests/integration/features/conversation-2/public-private.feature index 293949e5a..293949e5a 100644 --- a/tests/integration/features/conversation/public-private.feature +++ b/tests/integration/features/conversation-2/public-private.feature diff --git a/tests/integration/features/conversation/remove-participant.feature b/tests/integration/features/conversation-2/remove-participant.feature index 54dc25c24..54dc25c24 100644 --- a/tests/integration/features/conversation/remove-participant.feature +++ b/tests/integration/features/conversation-2/remove-participant.feature diff --git a/tests/integration/features/conversation/remove-self.feature b/tests/integration/features/conversation-2/remove-self.feature index fe6c16dad..fe6c16dad 100644 --- a/tests/integration/features/conversation/remove-self.feature +++ b/tests/integration/features/conversation-2/remove-self.feature diff --git a/tests/integration/features/conversation/rename-room.feature b/tests/integration/features/conversation-2/rename-room.feature index b7599b17d..b7599b17d 100644 --- a/tests/integration/features/conversation/rename-room.feature +++ b/tests/integration/features/conversation-2/rename-room.feature diff --git a/tests/integration/features/conversation/set-description.feature b/tests/integration/features/conversation-2/set-description.feature index 19bb5486c..19bb5486c 100644 --- a/tests/integration/features/conversation/set-description.feature +++ b/tests/integration/features/conversation-2/set-description.feature diff --git a/tests/integration/features/conversation/set-listable.feature b/tests/integration/features/conversation-2/set-listable.feature index 7d94f03ec..7d94f03ec 100644 --- a/tests/integration/features/conversation/set-listable.feature +++ b/tests/integration/features/conversation-2/set-listable.feature diff --git a/tests/integration/features/conversation/set-password.feature b/tests/integration/features/conversation-2/set-password.feature index 8a29bd424..8a29bd424 100644 --- a/tests/integration/features/conversation/set-password.feature +++ b/tests/integration/features/conversation-2/set-password.feature diff --git a/tests/integration/features/conversation/sip-dialin.feature b/tests/integration/features/conversation-2/sip-dialin.feature index 698766801..698766801 100644 --- a/tests/integration/features/conversation/sip-dialin.feature +++ b/tests/integration/features/conversation-2/sip-dialin.feature |