From eb75377dd35d3260c78b01a76d4f9335999ac7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elena=20Barrios=20Gal=C3=A1n?= <elena@tresipunt.com>
Date: Tue, 4 Apr 2023 07:29:40 +0000
Subject: [PATCH] Revert ":q!Merge branch 'main' into
 feature/nextcloud_menu_settings"

This reverts commit 4e64f57c554a39cdcaa825ed0aa24ec19bb11f48
---
 dd-ctl                              | 10 ----------
 stress-tests/dd-stress-test.tpl.jmx |  8 ++++----
 stress-tests/dd-tests-selenium.py   | 12 ++++--------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/dd-ctl b/dd-ctl
index 46011bd..261e8dc 100755
--- a/dd-ctl
+++ b/dd-ctl
@@ -806,16 +806,6 @@ upgrade_plugins_moodle(){
 	#mkdir -p /tmp/moodle/local/tresipuntimportgc
 	#cp -R local_plugins/moodle/tresipuntimportgc/* /tmp/moodle/local/tresipuntimportgc/
 
-	curl --location https://github.com/danmarsden/moodle-mod_attendance/archive/refs/heads/MOODLE_311_STABLE.zip > mod_attendance.zip
-    unzip -q mod_attendance.zip -d /tmp/moodle/mod/
-    mv /tmp/moodle/mod/moodle-mod_attendance-MOODLE_311_STABLE /tmp/moodle/mod/attendance
-    rm mod_attendance.zip
-
-	curl --location https://github.com/projectestac/moodle-mod_geogebra/archive/refs/heads/MOODLE_39_STABLE.zip > mod_geogebra.zip
-    unzip -q mod_geogebra.zip -d /tmp/moodle/mod/
-    mv /tmp/moodle/mod/moodle-mod_geogebra-MOODLE_39_STABLE /tmp/moodle/mod/geogebra
-    rm mod_geogebra.zip
-
 	cp -R /tmp/moodle/* "$SRC_FOLDER/moodle/"
 	rm -rf /tmp/moodle
 	docker exec -i dd-apps-moodle php7 admin/cli/purge_caches.php
diff --git a/stress-tests/dd-stress-test.tpl.jmx b/stress-tests/dd-stress-test.tpl.jmx
index b05b8b8..060d0d8 100644
--- a/stress-tests/dd-stress-test.tpl.jmx
+++ b/stress-tests/dd-stress-test.tpl.jmx
@@ -139,7 +139,7 @@
       </ConfigTestElement>
       <hashTree/>
       <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="SAML Login Method" enabled="true">
-        <stringProp name="ThreadGroup.on_sample_error">startnextloop</stringProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
         <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
           <boolProp name="LoopController.continue_forever">false</boolProp>
           <intProp name="LoopController.loops">-1</intProp>
@@ -192,8 +192,8 @@
           <stringProp name="TestPlan.comments">Send response from login to SP for processing</stringProp>
         </ModuleController>
         <hashTree/>
-        <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report N users" enabled="true">
-          <boolProp name="ResultCollector.error_logging">true</boolProp>
+        <ResultCollector guiclass="SummaryReport" testclass="ResultCollector" testname="Summary Report 20 users" enabled="true">
+          <boolProp name="ResultCollector.error_logging">false</boolProp>
           <objProp>
             <name>saveConfig</name>
             <value class="SampleSaveConfiguration">
@@ -230,7 +230,7 @@
         </ResultCollector>
         <hashTree/>
         <ResultCollector guiclass="RespTimeGraphVisualizer" testclass="ResultCollector" testname="Response Time Graph" enabled="true">
-          <boolProp name="ResultCollector.error_logging">true</boolProp>
+          <boolProp name="ResultCollector.error_logging">false</boolProp>
           <objProp>
             <name>saveConfig</name>
             <value class="SampleSaveConfiguration">
diff --git a/stress-tests/dd-tests-selenium.py b/stress-tests/dd-tests-selenium.py
index 2c57501..2dc94af 100644
--- a/stress-tests/dd-tests-selenium.py
+++ b/stress-tests/dd-tests-selenium.py
@@ -20,9 +20,6 @@ from selenium.webdriver.chrome.options import Options as ChromeOptions
 from typing import Any, Dict, Iterable, List
 
 
-STEP_TIMEOUT_SECONDS = 40
-
-
 class DDSession:
     driver: webdriver.Chrome
 
@@ -31,7 +28,7 @@ class DDSession:
         instance: str,
         users_file: str,
         out_dir: pathlib.Path,
-        stepTimeoutSeconds: int = STEP_TIMEOUT_SECONDS,
+        stepTimeoutSeconds: int = 20,
     ):
         self.instance = instance
         self.users_file = [
@@ -180,7 +177,6 @@ class DDSession:
             lambda d: (
                 d.find_elements(By.ID, "kc-form-login")
                 + d.find_elements(By.ID, "menu-apps-icon")
-                + d.find_elements(By.ID, "menu-apps-btn")
             )
         )
 
@@ -217,7 +213,7 @@ class DDSession:
         self.screenshot("OnlyOffice", "Opening")
 
         # Wait for OnlyOffice to start loading
-        oofCSS = ".app-onlyoffice #app iframe"
+        oofCSS = "div.app-onlyoffice #app iframe"
         WebDriverWait(self.driver, timeout=self.stepTimeoutSeconds).until(
             lambda d: d.find_elements(By.CSS_SELECTOR, oofCSS)
         )
@@ -296,13 +292,13 @@ def main_test(
     users_file: io.TextIOWrapper,
     out_dir: pathlib.Path,
     duration: int,
-    stepTimeoutSeconds: int = STEP_TIMEOUT_SECONDS,
+    stepTimeoutSeconds: int = 20,
 ) -> DDSession:
     session = DDSession(
         instance=instance,
         users_file=users_file.read(),
         out_dir=out_dir,
-        stepTimeoutSeconds=stepTimeoutSeconds,
+        stepTimeoutSeconds=20,
     )
 
     first_run = True