Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clients/python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
-e .
asyncio==3.4.3
iniconfig==2.1.0
maturin==1.8.3
Expand All @@ -7,4 +6,5 @@ pluggy==1.5.0
pytest==8.3.5
pytest-asyncio==0.26.0

# source .venv/bin/activate
# python -m venv venv
# source venv/bin/activate
14 changes: 8 additions & 6 deletions clients/python/tests/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ def start_mock_server():
packages = [
("actor-core", repo_root / "packages/actor-core"),
("nodejs", repo_root / "packages/platforms/nodejs"),
("memory", repo_root / "packages/drivers/memory")
("memory", repo_root / "packages/drivers/memory"),
("file-system", repo_root / "packages/drivers/file-system")
]

logger.info("Packing packages (3 total)")
Expand All @@ -81,15 +82,15 @@ def start_mock_server():
# Create server script
logger.info("Creating server start script")
server_dir = temp_path / "counter"
server_script_path = server_dir / "src/server.ts"
server_script_path = server_dir / "run.ts"


port = get_free_port()
server_script = f"""
import {{ app }} from "./index.ts";
import {{ app }} from "./actors/app.ts";
import {{ serve }} from "@actor-core/nodejs";

serve(app, {{ port: {port} }});
serve(app, {{ port: {port}, mode: "memory" }});
"""

server_script_path.write_text(server_script)
Expand All @@ -104,7 +105,8 @@ def start_mock_server():
"dependencies": {
"actor-core": f"file:{vendor_dir}/actor-core-actor-core.tgz",
"@actor-core/nodejs": f"file:{vendor_dir}/actor-core-nodejs.tgz",
"@actor-core/memory": f"file:{vendor_dir}/actor-core-memory.tgz"
"@actor-core/memory": f"file:{vendor_dir}/actor-core-memory.tgz",
"@actor-core/file-system": f"file:{vendor_dir}/actor-core-file-system.tgz",
},
"devDependencies": {
"tsx": "^3.12.7"
Expand All @@ -130,7 +132,7 @@ def start_mock_server():
# Start the server
logger.info("Starting the server")
process = subprocess.Popen(
["npx", "tsx", "src/server.ts"],
["npx", "tsx", "run.ts"],
cwd=server_dir
)

Expand Down
15 changes: 9 additions & 6 deletions clients/rust/tests/e2e.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ impl MockServer {
("actor-core", repo_root.join("packages/actor-core")),
("nodejs", repo_root.join("packages/platforms/nodejs")),
("memory", repo_root.join("packages/drivers/memory")),
("file-system", repo_root.join("packages/drivers/file-system")),
];

// Pack each package to the vendor directory
Expand Down Expand Up @@ -80,14 +81,14 @@ impl MockServer {

// Create the server directory structure
let server_dir = temp_path.join("counter");
let server_script_path = server_dir.join("src/server.ts");
let server_script_path = server_dir.join("run.ts");

// Write the server script
let server_script = r#"
import { app } from "./index.ts";
import { app } from "./actors/app.ts";
import { serve } from "@actor-core/nodejs";

serve(app, { port: PORT });
serve(app, { port: PORT, mode: "memory" });
"#
.replace("PORT", &port.to_string());

Expand All @@ -104,15 +105,17 @@ serve(app, { port: PORT });
"dependencies": {{
"actor-core": "file:{}",
"@actor-core/nodejs": "file:{}",
"@actor-core/memory": "file:{}"
"@actor-core/memory": "file:{}",
"@actor-core/file-system": "file:{}"
}},
"devDependencies": {{
"tsx": "^3.12.7"
}}
}}"#,
vendor_dir.join("actor-core-actor-core.tgz").display(),
vendor_dir.join("actor-core-nodejs.tgz").display(),
vendor_dir.join("actor-core-memory.tgz").display()
vendor_dir.join("actor-core-memory.tgz").display(),
vendor_dir.join("actor-core-file-system.tgz").display()
);

std::fs::write(&package_json_path, package_json).expect("Failed to write package.json");
Expand All @@ -134,7 +137,7 @@ serve(app, { port: PORT });

// Spawn the server process
let child = Command::new("npx")
.args(["tsx", "src/server.ts"])
.args(["tsx", "run.ts"])
.current_dir(&server_dir)
.spawn()
.expect("Failed to spawn server process");
Expand Down