region divide added

Author: philimon-reset

l10n_CM/Unified/conftest.py

@@ -25,17 +25,19 @@ def is_port_in_use() -> bool:
         return s.connect_ex((LOCALHOST, PORT)) == 0
 
 
-def get_html_files(live_site):
-    address_path_to_site = parent_dir + f"/sites/{live_site}/{live_site}_ad.html"
-    cc_path_to_site = parent_dir + f"/sites/{live_site}/{live_site}_cc.html"
+def get_html_files(live_site, region):
+    address_path_to_site = (
+        parent_dir + f"/sites/{live_site}/{region}/{live_site}_ad.html"
+    )
+    cc_path_to_site = parent_dir + f"/sites/{live_site}/{region}/{live_site}_cc.html"
     if os.path.exists(address_path_to_site) and os.path.exists(cc_path_to_site):
         address_html_file, cc_html_file = "", ""
         with open(address_path_to_site, "r", encoding="utf-8") as fp:
             address_html_file = fp.read()
         with open(cc_path_to_site, "r", encoding="utf-8") as fp:
             cc_html_file = fp.read()
         return address_html_file, cc_html_file
-    return ""
+    return "", ""
 
 
 @pytest.fixture()
@@ -45,7 +47,7 @@ def region():
 
 @pytest.fixture()
 def live_site():
-    return os.environ.get("CM_SITE", "demo")
+    return os.environ.get("CM_SITE", "amazon")
 
 
 @pytest.fixture()
@@ -68,7 +70,11 @@ def prefs_list(add_to_prefs_list: List[tuple[str, str | bool]], region: str):
 
 @pytest.fixture()
 def ad_site_data(live_site, region):
-    ad_live_site = f"{live_site}/{live_site}_ad"
+    ad_live_site = (
+        f"{live_site}/{region}/{live_site}_ad"
+        if live_site != "demo"
+        else f"{live_site}/{live_site}_ad"
+    )
     path_to_site = parent_dir + "/constants/"
     with open(path_to_site + ad_live_site + ".json", "r") as fp:
         live_site_data = load(fp)
@@ -84,8 +90,12 @@ def ad_site_data(live_site, region):
 
 
 @pytest.fixture()
-def cc_site_data(live_site):
-    cc_live_site = f"{live_site}/{live_site}_cc"
+def cc_site_data(live_site, region):
+    cc_live_site = (
+        f"{live_site}/{region}/{live_site}_cc"
+        if live_site != "demo"
+        else f"{live_site}/{live_site}_cc"
+    )
     path_to_site = parent_dir + "/constants/"
     with open(path_to_site + cc_live_site + ".json", "r") as fp:
         live_site_data = load(fp)
@@ -105,14 +115,14 @@ def httpserver_listen_address():
 
 
 @pytest.fixture()
-def serve_live_site(is_live_site, live_site, request):
+def serve_live_site(is_live_site, live_site, region, request):
     """Serve the live site only if needed."""
     if not is_live_site or is_port_in_use():
         return
     # only serve content if url is already not served.
     try:
+        ad_html_file, cc_html_file = get_html_files(live_site, region)
         http_server = request.getfixturevalue("httpserver")
-        ad_html_file, cc_html_file = get_html_files(live_site)
         http_server.expect_request(f"/{live_site}_ad.html").respond_with_data(
             ad_html_file, content_type="text/html"
         )

l10n_CM/constants/amazon/amazon_ad.json renamed to l10n_CM/constants/amazon/US/amazon_ad.json

@@ -24,20 +24,22 @@
 
 class MyHttpRequestHandler(SimpleHTTPRequestHandler):
     live_site = None
+    region = None
 
     def translate_path(self, path):
         """switch the default directory where the html files are served from."""
-        base_dir = os.path.join(current_dir, "sites", self.live_site)
+        base_dir = os.path.join(current_dir, "sites", self.live_site, self.region)
         return os.path.join(base_dir, path.lstrip("/"))
 
     def log_message(self, format, *args):
         """Remove logs from the server."""
         pass
 
 
-def start_server(live_site):
+def start_server(live_site, current_region):
     # set live site attribute
     MyHttpRequestHandler.live_site = live_site
+    MyHttpRequestHandler.region = current_region
     # start web server on a separate thread to avoid blocking calls.
     http = HTTPServer((LOCALHOST, PORT), MyHttpRequestHandler)
 
@@ -47,9 +49,15 @@ def start_server(live_site):
 
 
 @contextmanager
-def running_server(live_site):
+def running_server(live_site, test_region):
     """Context manager to run a server and clean it up automatically."""
-    httpd, server_thread = start_server(live_site)
+    html_path = os.path.join(current_dir, "sites", live_site, test_region)
+    if not os.path.exists(html_path):
+        raise FileNotFoundError(
+            f"Expected HTML directory not found at path: {html_path}"
+        )
+
+    httpd, server_thread = start_server(live_site, test_region)
     try:
         yield  # control goes to the caller, server runs in the background
     finally:
@@ -166,8 +174,8 @@ def run_unified(regions, unified_flags):
             for unified_region in regions:
                 run_tests(unified_region, live_site, unified_flags, unified_tests)
         else:
-            with running_server(live_site):
-                for unified_region in regions:
+            for unified_region in regions:
+                with running_server(live_site, unified_region):
                     run_tests(unified_region, live_site, unified_flags, unified_tests)
 
 
@@ -195,5 +203,5 @@ def run_unified(regions, unified_flags):
             if site == "demo":
                 run_tests(region, site, flags, tests)
             else:
-                with running_server(site):
+                with running_server(site, region):
                     run_tests(region, site, flags, tests)