From 7df5351a1ade8bfe39db39cfe71b113ccccf0c19 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Tue, 24 Sep 2024 15:42:27 +0545 Subject: [PATCH] revert debug lines --- .drone.star | 27 +++---- test/gui/tst_loginLogout/test.feature | 100 +++++--------------------- 2 files changed, 28 insertions(+), 99 deletions(-) diff --git a/.drone.star b/.drone.star index 544812322e8..627cb1c78cd 100644 --- a/.drone.star +++ b/.drone.star @@ -25,12 +25,11 @@ OC_UBUNTU = "owncloud/ubuntu:20.04" # https://github.com/owncloud/client/issues/10070 OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-39-amd64" OC_CI_SQUISH = "sawjan/squish:export-session" -OC_CI_SQUISH_UP = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64" PLUGINS_GIT_ACTION = "plugins/git-action:1" -PLUGINS_S3 = "plugins/s3:1.3" +PLUGINS_S3 = "plugins/s3" PLUGINS_SLACK = "plugins/slack" -TOOLHIPPIE_CALENS = "toolhippie/calens:0.4.0" +TOOLHIPPIE_CALENS = "toolhippie/calens:latest" # npm packages to install NPM_GHERLINT = "@gherlint/gherlint@1.1.0" @@ -128,12 +127,6 @@ config = { "tags": "~@skipOnOCIS", "skip": False, }, - "ocis-2": { - "version": "latest", - # comma separated list of tags to be used for filtering. E.g. "@tag1,@tag2" - "tags": "~@skipOnOCIS", - "skip": False, - }, }, }, } @@ -145,11 +138,10 @@ def main(ctx): unit_tests = unit_test_pipeline(ctx) gui_tests = gui_test_pipeline(ctx) - return gui_tests - # return pipelines + \ - # unit_tests + \ - # gui_tests + \ - # pipelinesDependsOn(notification(), unit_tests + gui_tests) + return pipelines + \ + unit_tests + \ + gui_tests + \ + pipelinesDependsOn(notification(), unit_tests + gui_tests) def from_secret(name): return { @@ -211,7 +203,6 @@ def gui_test_pipeline(ctx): for server, params in config["gui-tests"]["servers"].items(): squish_parameters = [ "--testsuite %s" % dir["guiTest"], - "--testcase %s/tst_loginLogout" % dir["guiTest"], "--reportgen html,%s" % dir["guiTestReport"], "--envvar QT_LOGGING_RULES=sync.httplogger=true;gui.socketapi=false", "--tags ~@skip", @@ -329,7 +320,7 @@ def unit_tests(image = OC_CI_CLIENT): def gui_tests(squish_parameters = "", server_type = "oc10"): return [{ "name": "GUItests", - "image": OC_CI_SQUISH, # if server_type == "ocis" else OC_CI_SQUISH_UP, + "image": OC_CI_SQUISH, "environment": { "LICENSEKEY": from_secret("SQUISH_LICENSEKEY"), "GUI_TEST_REPORT_DIR": dir["guiTestReport"], @@ -337,7 +328,7 @@ def gui_tests(squish_parameters = "", server_type = "oc10"): "MIDDLEWARE_URL": "http://testmiddleware:3000/", "BACKEND_HOST": "http://owncloud/" if server_type == "oc10" else "https://ocis:9200", "SECURE_BACKEND_HOST": "https://owncloud/" if server_type == "oc10" else "https://ocis:9200", - "OCIS": "true" if "ocis" in server_type else "false", + "OCIS": "true" if server_type == "ocis" else "false", "SERVER_INI": "%s/drone/server.ini" % dir["guiTest"], "SQUISH_PARAMETERS": squish_parameters, "STACKTRACE_FILE": "%s/stacktrace.log" % dir["guiTestReport"], @@ -587,7 +578,7 @@ def testMiddlewareService(server_type = "oc10"): "REMOTE_UPLOAD_DIR": "/uploads", } - if "ocis" in server_type: + if server_type == "ocis": environment["BACKEND_HOST"] = "https://ocis:9200" environment["TEST_WITH_GRAPH_API"] = "true" environment["RUN_ON_OCIS"] = "true" diff --git a/test/gui/tst_loginLogout/test.feature b/test/gui/tst_loginLogout/test.feature index f8fc2bb40c3..98bdca4091b 100644 --- a/test/gui/tst_loginLogout/test.feature +++ b/test/gui/tst_loginLogout/test.feature @@ -12,78 +12,6 @@ Feature: Logout users When the user "Alice" logs out using the client-UI Then user "Alice" should be signed out - Scenario: login after logging out normal Account - Given the user has started the client - When the user adds the following account: - | server | %local_server% | - | user | Alice | - | password | 1234 | - Then the account with displayname "Alice Hansen" and host "%local_server_hostname%" should be displayed - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server - - Scenario: login after logging out normal Account - Given the user has started the client - When the user adds the following account: - | server | %local_server% | - | user | Alice | - | password | 1234 | - Then the account with displayname "Alice Hansen" and host "%local_server_hostname%" should be displayed - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server - - Scenario: login after logging out normal Account - Given the user has started the client - When the user adds the following account: - | server | %local_server% | - | user | Alice | - | password | 1234 | - Then the account with displayname "Alice Hansen" and host "%local_server_hostname%" should be displayed - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server - - Scenario: login after logging out normal Account - Given the user has started the client - When the user adds the following account: - | server | %local_server% | - | user | Alice | - | password | 1234 | - Then the account with displayname "Alice Hansen" and host "%local_server_hostname%" should be displayed - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server - - Scenario: login after logging out normal Account - Given the user has started the client - When the user adds the following account: - | server | %local_server% | - | user | Alice | - | password | 1234 | - Then the account with displayname "Alice Hansen" and host "%local_server_hostname%" should be displayed - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server - - Scenario: login after logging out - Given user "Alice" has set up a client with default settings - And user "Alice" has logged out from the client-UI - When user "Alice" logs in using the client-UI - Then user "Alice" should be connected to the server - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server - - Scenario: login after logging out - Given user "Alice" has set up a client with default settings - And user "Alice" has logged out from the client-UI - When user "Alice" logs in using the client-UI - Then user "Alice" should be connected to the server - When the user quits the client - And the user starts the client - Then user "Alice" should be connected to the server Scenario: login after logging out Given user "Alice" has set up a client with default settings @@ -94,19 +22,29 @@ Feature: Logout users And the user starts the client Then user "Alice" should be connected to the server - Scenario: login after logging out + @skipOnOCIS + Scenario: login with incorrect and correct password after log out Given user "Alice" has set up a client with default settings And user "Alice" has logged out from the client-UI - When user "Alice" logs in using the client-UI - Then user "Alice" should be connected to the server - When the user quits the client - And the user starts the client + When user "ALice" opens login dialog + And user "ALice" enters the password "invalid" + And user "Alice" logs out from the login required dialog + And user "Alice" logs in using the client-UI Then user "Alice" should be connected to the server - Scenario: login after logging out - Given user "Alice" has set up a client with default settings - And user "Alice" has logged out from the client-UI - When user "Alice" logs in using the client-UI + @skipOnOCIS @issue-11619 + Scenario: login, logout and restart with oauth2 authentication + Given app "oauth2" has been "enabled" in the server + And the user has started the client + When the user adds the following oauth2 account: + | server | %local_server% | + | user | Alice | + | password | 1234 | + Then the account with displayname "Alice Hansen" and host "%local_server_hostname%" should be displayed + And user "Alice" should be connected to the server + When the user "Alice" logs out using the client-UI + Then user "Alice" should be signed out + When user "Alice" logs in using the client-UI with oauth2 Then user "Alice" should be connected to the server When the user quits the client And the user starts the client