From 62b4f1127b45cd7a2f7af9aa8bfc6b115e5bf4e1 Mon Sep 17 00:00:00 2001
From: Dipak Acharya <dpakach@gmail.com>
Date: Mon, 18 May 2020 10:24:30 +0545
Subject: [PATCH] Check running upload tests only

---
 .drone.star                                   | 72 ++-----------------
 .../features/webUIUpload/upload.feature       |  3 +-
 .../webUIUpload/uploadEdgecases.feature       |  1 +
 .../uploadFileGreaterThanQuotaSize.feature    |  1 +
 4 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/.drone.star b/.drone.star
index 01b48dcdf10..478bda500de 100644
--- a/.drone.star
+++ b/.drone.star
@@ -14,73 +14,6 @@ config = {
 	'yarnlint': True,
 
 	'acceptance': {
-		'webUI': {
-			'suites': {
-				'webUICreateFilesFolders': 'createFilesFolders',
-				'webUIDeleteFilesFolders': 'deleteFilesFolders',
-				'webUIFavorites': 'Favorites',
-				'webUIFiles': 'Files',
-				'webUILogin': 'Login',
-				'webUINotifications': 'Notifications',
-				'webUIPrivateLinks': 'PrivateLinks',
-				'webUIRenameFiles': 'RenameFiles',
-				'webUIRenameFolders': 'RenameFolders',
-				'webUIRestrictSharing': 'RestrictSharing',
-				'webUISharingAutocompletion': 'SharingAutocompletion',
-				'webUISharingInternalGroups': 'SharingInternalGroups',
-				'webUISharingInternalUsers': 'SharingInternalUsers',
-				'webUISharingPermissionsUsers': 'SharingPermissionsUsers',
-				'webUISharingFilePermissionsGroups': 'SharingFilePermissionsGroups',
-				'webUISharingFolderPermissionsGroups': 'SharingFolderPermissionsGroups',
-				'webUISharingFolderAdvancedPermissionsGroups': 'SharingFolderAdvPermissionsGrp',
-				'webUIResharing': 'Resharing',
-				'webUISharingPublic': 'SharingPublic',
-				'webUISharingPublicDifferentRoles': 'SharingPublicDifferentRoles',
-				'webUITrashbin': 'Trashbin',
-				'webUIUpload': 'Upload',
-				'webUISharingAcceptShares': 'SharingAcceptShares',
-				'webUISharingFilePermissionMultipleUsers': 'SharingFilePermissionMultipleUsers',
-				'webUISharingFolderPermissionMultipleUsers': 'SharingFolderPermissionMultipleUsers',
-				'webUISharingFolderAdvancedPermissionMultipleUsers': 'SharingFolderAdvancedPermissionMU',
-				'webUISharingNotifications': 'SharingNotifications',
-				'webUIAccount': 'Account'
-			},
-			'extraEnvironment': {
-				'OPENID_LOGIN': 'true',
-				'PHOENIX_CONFIG': '/srv/config/drone/config.json'
-			}
-		},
-		'webUIFederation': {
-			'suites': {
-				'webUISharingExternal': 'SharingExternal',
-			},
-			'extraEnvironment': {
-				'OPENID_LOGIN': 'true',
-				'REMOTE_BACKEND_HOST': 'http://federated'
-			},
-			'federatedServerNeeded': True,
-			'federatedServerVersion': 'daily-master-qa'
-		},
-		'webUI-XGA': {
-			'suites': {
-				'all': 'XGAPortrait',
-			},
-			'extraEnvironment': {
-				'OPENID_LOGIN': 'true',
-				'SCREEN_RESOLUTION': '768x1024'
-			},
-			'filterTags': '@smokeTest and not @skipOnXGAPortraitResolution and not @skip and not @skipOnOC10'
-		},
-		'webUI-iPhone': {
-			'suites': {
-				'all': 'iPhone',
-			},
-			'extraEnvironment': {
-				'OPENID_LOGIN': 'true',
-				'SCREEN_RESOLUTION': '375x812'
-			},
-			'filterTags': '@smokeTest and not @skipOnIphoneResolution and not @skip and @skipOnOC10'
-		},
 		'webUI-ocis': {
 			'suites': {
 				'all': 'webUIOCIS'
@@ -95,7 +28,7 @@ config = {
 				'PHOENIX_CONFIG': '/srv/config/drone/ocis-config.json'
 			},
 			'runningOnOCIS': True,
-			'filterTags': 'not @skip and not @skipOnOCIS',
+			'filterTags': 'not @skip and not @skipOnOCIS and @singleUpload',
 			'screenShots': True,
 		}
 	},
@@ -1173,6 +1106,9 @@ def revaService():
 			'REVA_LDAP_BIND_DN': 'cn=admin,dc=owncloud,dc=com',
 			'REVA_LDAP_BIND_PASSWORD': 'admin',
 			'REVA_LDAP_BASE_DN': 'dc=owncloud,dc=com',
+			'REVA_LOG_LEVEL': 'debug',
+			'REVA_LOG_PRETTY': 'true',
+			'REVA_LOG_COLOR': 'true',
 		},
 		'commands': [
 			'mkdir -p $REVA_STORAGE_HOME_DATA_TEMP_FOLDER',
diff --git a/tests/acceptance/features/webUIUpload/upload.feature b/tests/acceptance/features/webUIUpload/upload.feature
index 415d7eef425..f45375e05f0 100644
--- a/tests/acceptance/features/webUIUpload/upload.feature
+++ b/tests/acceptance/features/webUIUpload/upload.feature
@@ -1,3 +1,4 @@
+@uploadTest
 Feature: File Upload
 
   As a user
@@ -8,7 +9,7 @@ Feature: File Upload
     Given user "user1" has been created with default attributes
     And user "user1" has logged in using the webUI
 
-  @smokeTest
+  @smokeTest @singleUpload
   Scenario: simple upload of a file that does not exist before
     When the user uploads file "new-lorem.txt" using the webUI
     Then no message should be displayed on the webUI
diff --git a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature
index 53cd89a94a8..c3eaf5dbb57 100644
--- a/tests/acceptance/features/webUIUpload/uploadEdgecases.feature
+++ b/tests/acceptance/features/webUIUpload/uploadEdgecases.feature
@@ -1,3 +1,4 @@
+@uploadTest
 Feature: File Upload
 
   As a QA engineer
diff --git a/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature b/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature
index a80c7e32f3c..8f135ec6903 100644
--- a/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature
+++ b/tests/acceptance/features/webUIUpload/uploadFileGreaterThanQuotaSize.feature
@@ -1,3 +1,4 @@
+@uploadTest
 Feature: Upload a file
 
   As a user