Optimise tests to prefer non-Docker and be cross-platform

Author: SamuelMarks

.github/workflows/ci.yml

@@ -64,10 +64,10 @@ jobs:
         run: cargo run -p cdd-cli -- from_openapi to_sdk -i ./petstore_oas3.yaml -o ./target/petstore3
 
       - name: Test Swagger 2.0 Petstore Server & Client
-        run: bash scripts/test_server_and_client.sh ./petstore.json ./target/server_petstore2 ./target/client_petstore2
+        run: python scripts/test_server_and_client.py ./petstore.json ./target/server_petstore2 ./target/client_petstore2
 
       - name: Test OpenAPI 3.2.0 Petstore Server & Client
-        run: bash scripts/test_server_and_client.sh ./petstore_oas3.yaml ./target/server_petstore3 ./target/client_petstore3
+        run: python scripts/test_server_and_client.py ./petstore_oas3.yaml ./target/server_petstore3 ./target/client_petstore3
 
       - name: Check Documentation Coverage
         run: |

.pre-commit-config.yaml

@@ -45,36 +45,36 @@ repos:
 
       - id: test-swagger-2
         name: Test Swagger 2.0 Petstore SDK
-        entry: bash scripts/test_sdk.sh ../petstore.json ./target/petstore2
+        entry: python3 scripts/test_sdk.py ../petstore.json ./target/petstore2
         language: system
         pass_filenames: false
         types: [rust]
 
       - id: test-openapi-3
         name: Test OpenAPI 3.2.0 Petstore SDK
-        entry: bash scripts/test_sdk.sh ../petstore_oas3.json ./target/petstore3
+        entry: python3 scripts/test_sdk.py ../petstore_oas3.json ./target/petstore3
         language: system
         pass_filenames: false
         types: [rust]
 
       - id: test-server-swagger-2
         name: Test Swagger 2.0 Petstore Server & Client
-        entry: bash scripts/test_server_and_client.sh ../petstore.json ./target/server_petstore2 ./target/client_petstore2
+        entry: python3 scripts/test_server_and_client.py ../petstore.json ./target/server_petstore2 ./target/client_petstore2
         language: system
         pass_filenames: false
         types: [rust]
 
       - id: test-server-openapi-3
         name: Test OpenAPI 3.2.0 Petstore Server & Client
-        entry: bash scripts/test_server_and_client.sh ../petstore_oas3.json ./target/server_petstore3 ./target/client_petstore3
+        entry: python3 scripts/test_server_and_client.py ../petstore_oas3.json ./target/server_petstore3 ./target/client_petstore3
         language: system
         pass_filenames: false
         types: [rust]
 
       - id: wasm-build
         name: WASM Build Test
-        entry: python scripts/build_wasm.py
-        language: python
+        entry: python3 scripts/build_wasm.py
+        language: system
         pass_filenames: false
         types: [rust]
 

scripts/build_wasm.py

@@ -1,22 +1,24 @@
+#!/usr/bin/env python3
 import subprocess
 import sys
 
 def main():
     print("Adding wasm32-wasip1 target...")
     try:
-        subprocess.run("rustup target add wasm32-wasip1", shell=True, check=True)
-    except subprocess.CalledProcessError as e:
-        print(f"Failed to add target: {e}")
+        subprocess.run(["rustup", "target", "add", "wasm32-wasip1"], check=True)
+    except subprocess.CalledProcessError:
+        print("Failed to add target")
         sys.exit(1)
 
     print("Building WASM target...")
     try:
-        subprocess.run("cargo build -p cdd-cli --release --target wasm32-wasip1 --no-default-features", shell=True, check=True)
-    except subprocess.CalledProcessError as e:
-        print(f"WASM build failed: {e}")
-        # Make.bat had a fallback, we'll just print a warning and exit 0 or 1 depending on strictness.
-        # Let's exit 1 so pre-commit correctly reports failure.
+        subprocess.run(
+            ["cargo", "build", "-p", "cdd-cli", "--release", "--target", "wasm32-wasip1", "--no-default-features"], 
+            check=True
+        )
+    except subprocess.CalledProcessError:
+        print("WASM build failed")
         sys.exit(1)
 
 if __name__ == "__main__":
-    main()
+    main()

scripts/test_sdk.py

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+import sys
+import os
+import subprocess
+import random
+import time
+import atexit
+import shutil
+
+server_process = None
+mock_server_path = None
+
+def cleanup():
+    global server_process, mock_server_path
+    if server_process:
+        server_process.terminate()
+        server_process.wait()
+    if mock_server_path and os.path.exists(mock_server_path):
+        os.remove(mock_server_path)
+
+atexit.register(cleanup)
+
+def main():
+    if len(sys.argv) < 3:
+        print("Usage: test_sdk.py <spec> <output_dir>")
+        sys.exit(1)
+        
+    spec_file = sys.argv[1]
+    output_dir = sys.argv[2]
+    
+    port = random.randint(8000, 8999)
+    
+    global mock_server_path
+    mock_server_path = os.path.abspath(f"mock_server_{port}.py")
+    
+    mock_server_code = """
+from http.server import HTTPServer, BaseHTTPRequestHandler
+import sys
+port = int(sys.argv[1])
+class MockHandler(BaseHTTPRequestHandler):
+    def log_message(self, format, *args): pass
+    def do_GET(self): self.mock()
+    def do_POST(self): self.mock()
+    def do_PUT(self): self.mock()
+    def do_DELETE(self): self.mock()
+    def mock(self):
+        self.send_response(200)
+        self.send_header("Content-Type", "application/json")
+        self.end_headers()
+        path = self.path
+        if "findByStatus" in path or "findByTags" in path or "createWithList" in path or "createWithArray" in path:
+            if "pet" in path: self.wfile.write(b"[{\\"name\\": \\"mocked\\", \\"photoUrls\\": []}]")
+            else: self.wfile.write(b"[]")
+        else:
+            if "pet" in path: self.wfile.write(b"{\\"name\\": \\"mocked\\", \\"photoUrls\\": []}")
+            elif "user/login" in path: self.wfile.write(b"\\"token\\"")
+            else: self.wfile.write(b"{}")
+if __name__ == "__main__": HTTPServer(("", port), MockHandler).serve_forever()
+"""
+    with open(mock_server_path, "w") as f:
+        f.write(mock_server_code)
+
+    global server_process
+    server_process = subprocess.Popen([sys.executable, mock_server_path, str(port)])
+    
+    time.sleep(2)
+    
+    if os.path.exists(output_dir):
+        shutil.rmtree(output_dir)
+        
+    subprocess.run(["cargo", "run", "-p", "cdd-cli", "--", "from_openapi", "to_sdk", "-i", spec_file, "-o", output_dir, "--target", "client-reqwest", "--tests"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    
+    with open(os.path.join(output_dir, "Cargo.toml"), "a") as f:
+        f.write("\n[workspace]\n")
+        
+    api_contracts_path = os.path.join(output_dir, "tests", "api_contracts.rs")
+    if os.path.exists(api_contracts_path):
+        with open(api_contracts_path, "r") as f:
+            content = f.read()
+        content = content.replace("localhost:8080", f"127.0.0.1:{port}")
+        with open(api_contracts_path, "w") as f:
+            f.write(content)
+            
+    try:
+        subprocess.run(["cargo", "test"], cwd=output_dir, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    except subprocess.CalledProcessError:
+        print(f"Test failed for {spec_file}")
+        subprocess.run(["cargo", "test"], cwd=output_dir)
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()

scripts/test_sdk.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env python3
+import sys
+import os
+import subprocess
+import random
+import time
+import atexit
+import shutil
+
+server_process = None
+
+def cleanup():
+    global server_process
+    if server_process:
+        server_process.terminate()
+        server_process.wait()
+
+atexit.register(cleanup)
+
+def main():
+    if len(sys.argv) < 4:
+        print("Usage: test_server.py <spec> <server_out> <client_out>")
+        sys.exit(1)
+        
+    spec_file = sys.argv[1]
+    server_dir = sys.argv[2]
+    client_dir = sys.argv[3]
+    
+    port = random.randint(8000, 8999)
+    
+    # 1. Generate Server
+    if os.path.exists(server_dir):
+        shutil.rmtree(server_dir)
+        
+    subprocess.run(["cargo", "run", "-p", "cdd-cli", "--", "from_openapi", "to_server", "-i", spec_file, "-o", server_dir], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    
+    with open(os.path.join(server_dir, "Cargo.toml"), "a") as f:
+        f.write("\n[workspace]\n")
+        
+    subprocess.run(["cargo", "build"], cwd=server_dir, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    
+    env = os.environ.copy()
+    env["CDD_WEB_BIND"] = f"127.0.0.1:{port}"
+    
+    global server_process
+    server_process = subprocess.Popen(["cargo", "run", "--", "--ephemeral"], cwd=server_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    
+    time.sleep(5)
+    
+    # 2. Generate Client
+    if os.path.exists(client_dir):
+        shutil.rmtree(client_dir)
+        
+    subprocess.run(["cargo", "run", "-p", "cdd-cli", "--", "from_openapi", "to_sdk", "-i", spec_file, "-o", client_dir, "--target", "client-reqwest", "--tests"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    
+    with open(os.path.join(client_dir, "Cargo.toml"), "a") as f:
+        f.write("\n[workspace]\n")
+        
+    api_contracts_path = os.path.join(client_dir, "tests", "api_contracts.rs")
+    if os.path.exists(api_contracts_path):
+        with open(api_contracts_path, "r") as f:
+            content = f.read()
+        content = content.replace("localhost:8080", f"127.0.0.1:{port}")
+        with open(api_contracts_path, "w") as f:
+            f.write(content)
+            
+    try:
+        subprocess.run(["cargo", "test"], cwd=client_dir, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, check=True)
+    except subprocess.CalledProcessError:
+        print(f"Test failed for {spec_file} against generated server")
+        subprocess.run(["cargo", "test"], cwd=client_dir)
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()