mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
port: use kernel-assigned port number for tests
Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
b388d2e1f4
commit
05d1cf71dc
2 changed files with 6 additions and 5 deletions
|
|
@ -14,6 +14,7 @@ fn start_kernel(server_spec: &str) -> (JoinHandle<()>, SocketAddr) {
|
||||||
.expect("invalid server address")
|
.expect("invalid server address")
|
||||||
.next()
|
.next()
|
||||||
.expect("unable to resolve server address");
|
.expect("unable to resolve server address");
|
||||||
|
// Attempt to bind. This will fail if the port is in use.
|
||||||
let temp_server = TcpListener::bind(server_addr).unwrap();
|
let temp_server = TcpListener::bind(server_addr).unwrap();
|
||||||
let server_addr = temp_server.local_addr().unwrap();
|
let server_addr = temp_server.local_addr().unwrap();
|
||||||
drop(temp_server);
|
drop(temp_server);
|
||||||
|
|
@ -45,7 +46,7 @@ fn start_kernel(server_spec: &str) -> (JoinHandle<()>, SocketAddr) {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn shutdown() {
|
fn shutdown() {
|
||||||
let server_spec = "localhost:9999";
|
let server_spec = "localhost:0";
|
||||||
|
|
||||||
// Start the server in another thread.
|
// Start the server in another thread.
|
||||||
let (main_thread, server_spec) = start_kernel(server_spec);
|
let (main_thread, server_spec) = start_kernel(server_spec);
|
||||||
|
|
@ -63,7 +64,7 @@ fn shutdown() {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn send_scalar_message() {
|
fn send_scalar_message() {
|
||||||
let server_spec = "localhost:9998";
|
let server_spec = "localhost:0";
|
||||||
// Start the server in another thread
|
// Start the server in another thread
|
||||||
let (main_thread, server_spec) = start_kernel(server_spec);
|
let (main_thread, server_spec) = start_kernel(server_spec);
|
||||||
|
|
||||||
|
|
@ -122,7 +123,7 @@ fn send_scalar_message() {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn send_move_message() {
|
fn send_move_message() {
|
||||||
let server_spec = "localhost:9997";
|
let server_spec = "localhost:0";
|
||||||
|
|
||||||
let (main_thread, server_spec) = start_kernel(server_spec);
|
let (main_thread, server_spec) = start_kernel(server_spec);
|
||||||
|
|
||||||
|
|
@ -171,7 +172,7 @@ fn send_move_message() {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn send_borrow_message() {
|
fn send_borrow_message() {
|
||||||
let server_spec = "localhost:9997";
|
let server_spec = "localhost:0";
|
||||||
let (main_thread, server_spec) = start_kernel(server_spec);
|
let (main_thread, server_spec) = start_kernel(server_spec);
|
||||||
let (server_addr_send, server_addr_recv) = channel();
|
let (server_addr_send, server_addr_recv) = channel();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ use crate::Result;
|
||||||
|
|
||||||
use std::net::{SocketAddr, IpAddr, Ipv4Addr};
|
use std::net::{SocketAddr, IpAddr, Ipv4Addr};
|
||||||
|
|
||||||
thread_local!(static NETWORK_CONNECT_ADDRESS: RefCell<SocketAddr> = RefCell::new(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080)));
|
thread_local!(static NETWORK_CONNECT_ADDRESS: RefCell<SocketAddr> = RefCell::new(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 0)));
|
||||||
thread_local!(static XOUS_SERVER_CONNECTION: RefCell<Option<TcpStream>> = RefCell::new(None));
|
thread_local!(static XOUS_SERVER_CONNECTION: RefCell<Option<TcpStream>> = RefCell::new(None));
|
||||||
|
|
||||||
/// Set the network address for this particular thread.
|
/// Set the network address for this particular thread.
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue