locust-cloud 1.26.4.dev12__tar.gz → 1.26.4.dev17__tar.gz

{locust_cloud-1.26.4.dev12 → locust_cloud-1.26.4.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust-cloud
-Version: 1.26.4.dev12
+Version: 1.26.4.dev17
 Summary: Locust Cloud
 Project-URL: homepage, https://locust.cloud
 Project-URL: repository, https://github.com/locustcloud/locust-cloud

{locust_cloud-1.26.4.dev12 → locust_cloud-1.26.4.dev17}/locust_cloud/__init__.py

@@ -4,6 +4,7 @@ import pathlib
 import time
 import webbrowser
 from argparse import ArgumentTypeError
+from datetime import timedelta
 from threading import Thread
 
 import requests
@@ -13,13 +14,22 @@ from locust_cloud.args import (
     valid_project_path,
     zip_project_paths,
 )
-from locust_cloud.common import __version__
+from locust_cloud.common import CloudConfig, __version__, write_cloud_config
 from locust_cloud.import_finder import get_imported_files
 from locust_cloud.input_events import input_listener
 from locust_cloud.websocket import SessionMismatchError, Websocket, WebsocketTimeout
 
 logger = logging.getLogger(__name__)
 
+if os.getenv("LOCUSTCLOUD_USER_SUB_ID") and os.getenv("LOCUSTCLOUD_REFRESH_TOKEN") and os.getenv("LOCUSTCLOUD_REGION"):
+    config = CloudConfig(
+        refresh_token=os.getenv("LOCUSTCLOUD_REFRESH_TOKEN"),
+        user_sub_id=os.getenv("LOCUSTCLOUD_USER_SUB_ID"),
+        refresh_token_expires=int(time.time() + timedelta(days=365).total_seconds()),
+        region=os.getenv("LOCUSTCLOUD_REGION"),
+    )
+    write_cloud_config(config)
+
 
 def configure_logging(loglevel: str) -> None:
     format = (
@@ -148,7 +158,8 @@ def main(locustfiles: list[str] | None = None):
         session_id = js["session_id"]
 
         def open_ui():
-            webbrowser.open_new_tab("https://auth.locust.cloud/load-test")
+            extrasubdomain = ".dev." if "api-dev" in session.api_url else "."
+            webbrowser.open_new_tab(f"https://auth{extrasubdomain}locust.cloud/load-test")
 
         Thread(target=input_listener({"\r": open_ui, "\n": open_ui}), daemon=True).start()
 

{locust_cloud-1.26.4.dev12 → locust_cloud-1.26.4.dev17}/locust_cloud/apisession.py

@@ -59,8 +59,6 @@ class ApiSession(requests.Session):
             refresh_token = config.refresh_token
             id_token_expires = config.id_token_expires
 
-        assert id_token
-
         self.__user_sub_id = user_sub_id
         self.__refresh_token = refresh_token
         self.__id_token_expires = id_token_expires - 60  # Refresh 1 minute before expiry

{locust_cloud-1.26.4.dev12 → locust_cloud-1.26.4.dev17}/tests/browser_tests.py

@@ -8,24 +8,20 @@ from playwright.sync_api import expect, sync_playwright
 HEADLESS = bool(os.environ.get("HEADLESS", False))
 
 
-def do_url_test(page, context):
+def do_url_test(page, _context):
     # skip dashboard tutorial
     page.get_by_text("Skip").click()
-    time.sleep(10)
+    time.sleep(5)
 
-    with context.expect_page() as url_test_page_info:
-        page.get_by_text("Run in Browser").click()
-
-    url_test_page = url_test_page_info.value
-    url_test_page.wait_for_load_state()
+    page.get_by_text("Run in Browser").click()
 
     # skip locust tutorial
-    url_test_page.get_by_text("Skip").click()
+    page.get_by_text("Skip").click()
 
     # Select the mock target class for this test run
-    url_test_page.get_by_text("Mock Target").click()
+    page.get_by_text("Mock Target").click()
 
-    button = url_test_page.locator("button[type='submit']")
+    button = page.locator("button[type='submit']")
     expect(button).to_be_enabled(timeout=80000)
     button.click()
 
@@ -33,10 +29,10 @@ def do_url_test(page, context):
     time.sleep(20)
 
     # Stop the test
-    url_test_page.get_by_text("Stop").click()
+    page.get_by_text("Stop").click()
 
     # Wait for the test to have stopped and the new button to appear
-    button = url_test_page.locator('button:has-text("New")')
+    button = page.locator('button:has-text("New")')
     button.wait_for(state="visible", timeout=10000)