diff --git a/energy-tests/nextcloud_docs_collaboration.py b/energy-tests/nextcloud_docs_collaboration.py index f85c089e..5588e4e8 100644 --- a/energy-tests/nextcloud_docs_collaboration.py +++ b/energy-tests/nextcloud_docs_collaboration.py @@ -52,6 +52,7 @@ def collaborate(playwright: Playwright, browser_name: str) -> None: first_message = "FIRST_VALIDATION_MESSAGE" admin_user.get_by_role("dialog", name="colab_meeting.md").get_by_role("document").locator("div").first.type(first_message) expect(docs_user.get_by_text(first_message)).to_be_visible() + log_note("GMT_SCI_R=1") for x in range(1, 7): random_message = get_random_text() @@ -65,6 +66,7 @@ def collaborate(playwright: Playwright, browser_name: str) -> None: docs_user.get_by_role("dialog", name="colab_meeting.md").get_by_role("document").locator("div").first.type(random_message) expect(admin_user.get_by_text(random_message)).to_be_visible(timeout=15_000) + log_note("GMT_SCI_R=1") log_note("Sleeping for 5 seconds") sleep(5) diff --git a/energy-tests/nextcloud_talk.py b/energy-tests/nextcloud_talk.py index 9fb563a8..517d0c5d 100644 --- a/energy-tests/nextcloud_talk.py +++ b/energy-tests/nextcloud_talk.py @@ -20,6 +20,7 @@ def send_message(sender, message): sender.get_by_role("textbox", name="Write message, @ to mention someone …").click() sender.get_by_role("textbox", name="Write message, @ to mention someone …").fill(message) sender.get_by_role("textbox", name="Write message, @ to mention someone …").press("Enter") + log_note("GMT_SCI_R=1") def create_conversation(playwright: Playwright, browser_name: str) -> str: headless = True diff --git a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml index 5a91129d..e4c93128 100644 --- a/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml +++ b/energy-tests/usage_scenario-fpm-mariadb-talk-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud FPM image with a MariaDB and starts a Talk conversation. Uses a playwright script running Chromium to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-fpm-mariadb.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-mariadb-docs-chromium.yml b/energy-tests/usage_scenario-mariadb-docs-chromium.yml index dd16a7a1..89a2779c 100644 --- a/energy-tests/usage_scenario-mariadb-docs-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-docs-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a MariaDB and collaborates on a document. Uses a playwright script running Chromium to create an admin account, install the recommended apps. Then creates a new user, creates a document and shares it. Finally, works on the document adding text from two browsers. compose-file: !include compose-mariadb.yml +sci: + R_d: collaborative edit + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-mariadb-docs-firefox.yml b/energy-tests/usage_scenario-mariadb-docs-firefox.yml index 95d5d48c..3b809c45 100644 --- a/energy-tests/usage_scenario-mariadb-docs-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-docs-firefox.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a MariaDB and collaborates on a document. Uses a playwright script running Firefox to create an admin account, install the recommended apps. Then creates a new user, creates a document and shares it. Finally, works on the document adding text from two browsers. compose-file: !include compose-mariadb.yml +sci: + R_d: collaborative edit + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-mariadb-talk-chromium.yml b/energy-tests/usage_scenario-mariadb-talk-chromium.yml index 6b559e21..2b8029cc 100644 --- a/energy-tests/usage_scenario-mariadb-talk-chromium.yml +++ b/energy-tests/usage_scenario-mariadb-talk-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a MariaDB and starts a Talk conversation. Uses a playwright script running Chromium to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-mariadb.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-mariadb-talk-firefox.yml b/energy-tests/usage_scenario-mariadb-talk-firefox.yml index 5afd06d6..b60dc491 100644 --- a/energy-tests/usage_scenario-mariadb-talk-firefox.yml +++ b/energy-tests/usage_scenario-mariadb-talk-firefox.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a MariaDB and starts a Talk conversation. Uses a playwright script running Firefox to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-mariadb.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-postgres-docs-chromium.yml b/energy-tests/usage_scenario-postgres-docs-chromium.yml index c8dd399c..83ab9dcd 100644 --- a/energy-tests/usage_scenario-postgres-docs-chromium.yml +++ b/energy-tests/usage_scenario-postgres-docs-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a Postgres and collaborates on a document. Uses a playwright script running Chromium to create an admin account, install the recommended apps. Then creates a new user, creates a document and shares it. Finally, works on the document adding text from two browsers. compose-file: !include compose-postgres.yml +sci: + R_d: collaborative edit + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-postgres-docs-firefox.yml b/energy-tests/usage_scenario-postgres-docs-firefox.yml index 519e432a..0518882d 100644 --- a/energy-tests/usage_scenario-postgres-docs-firefox.yml +++ b/energy-tests/usage_scenario-postgres-docs-firefox.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a Postgres and collaborates on a document. Uses a playwright script running Firefox to create an admin account, install the recommended apps. Then creates a new user, creates a document and shares it. Finally, works on the document adding text from two browsers. compose-file: !include compose-postgres.yml +sci: + R_d: collaborative edit + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-postgres-talk-chromium.yml b/energy-tests/usage_scenario-postgres-talk-chromium.yml index 9e279245..8dc4c672 100644 --- a/energy-tests/usage_scenario-postgres-talk-chromium.yml +++ b/energy-tests/usage_scenario-postgres-talk-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a Postgres and starts a Talk conversation. Uses a playwright script running Chromium to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-postgres.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-postgres-talk-firefox.yml b/energy-tests/usage_scenario-postgres-talk-firefox.yml index 46d3e388..ccfe9665 100644 --- a/energy-tests/usage_scenario-postgres-talk-firefox.yml +++ b/energy-tests/usage_scenario-postgres-talk-firefox.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a Postgres and starts a Talk conversation. Uses a playwright script running Firefox to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-postgres.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-sqlite-docs-chromium.yml b/energy-tests/usage_scenario-sqlite-docs-chromium.yml index 3eff3ef7..3c03cc98 100644 --- a/energy-tests/usage_scenario-sqlite-docs-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-docs-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a SQLite and collaborates on a document. Uses a playwright script running Chromium to create an admin account, install the recommended apps. Then creates a new user, creates a document and shares it. Finally, works on the document adding text from two browsers. compose-file: !include compose-sqlite.yml +sci: + R_d: collaborative edit + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-sqlite-docs-firefox.yml b/energy-tests/usage_scenario-sqlite-docs-firefox.yml index 12b0bc5e..3443a85a 100644 --- a/energy-tests/usage_scenario-sqlite-docs-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-docs-firefox.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a SQLite and collaborates on a document. Uses a playwright script running Firefox to create an admin account, install the recommended apps. Then creates a new user, creates a document and shares it. Finally, works on the document adding text from two browsers. compose-file: !include compose-sqlite.yml +sci: + R_d: collaborative edit + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-sqlite-talk-chromium.yml b/energy-tests/usage_scenario-sqlite-talk-chromium.yml index 2a83fe85..61eeeca9 100644 --- a/energy-tests/usage_scenario-sqlite-talk-chromium.yml +++ b/energy-tests/usage_scenario-sqlite-talk-chromium.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a SQLite and starts a Talk conversation. Uses a playwright script running Chromium to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-sqlite.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright diff --git a/energy-tests/usage_scenario-sqlite-talk-firefox.yml b/energy-tests/usage_scenario-sqlite-talk-firefox.yml index 3746d95b..67922801 100644 --- a/energy-tests/usage_scenario-sqlite-talk-firefox.yml +++ b/energy-tests/usage_scenario-sqlite-talk-firefox.yml @@ -4,6 +4,9 @@ author: Danilo Jesic description: Installs the official Nextcloud image with a SQLite and starts a Talk conversation. Uses a playwright script running Firefox to create an admin account, install the recommended apps and then create a Talk conversation where guest users will send each other random text. compose-file: !include compose-sqlite.yml +sci: + R_d: Talk message + services: gcb-playwright: image: greencoding/gcb_playwright