Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xvar/fix-network-tests-firewall-prompts' into 'master'

Browse Source 
Replaced usage of 0.0.0.0 with 127.0.0.1 in network tests to prevent firewall prompts when running tests on Windows

See merge request veloren/veloren!1525
This commit is contained in:
Marcel
2020-11-15 22:50:22 +00:00
parent d219c88407 639281bc32
commit c65bb82c8c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
network/src/api.rs
View File

@ -288,7 +288,7 @@ impl Network {
/// std::thread::spawn(f); /// std::thread::spawn(f);
/// block_on(async { /// block_on(async {
/// network /// network
/// .listen(ProtocolAddr::Tcp("0.0.0.0:2000".parse().unwrap())) /// .listen(ProtocolAddr::Tcp("127.0.0.1:2000".parse().unwrap()))
/// .await?; /// .await?;
/// network /// network
/// .listen(ProtocolAddr::Udp("127.0.0.1:2001".parse().unwrap())) /// .listen(ProtocolAddr::Udp("127.0.0.1:2001".parse().unwrap()))
@ -330,8 +330,8 @@ impl Network {
/// # let (remote, fr) = Network::new(Pid::new()); /// # let (remote, fr) = Network::new(Pid::new());
/// # std::thread::spawn(fr); /// # std::thread::spawn(fr);
/// block_on(async { /// block_on(async {
/// # remote.listen(ProtocolAddr::Tcp("0.0.0.0:2010".parse().unwrap())).await?; /// # remote.listen(ProtocolAddr::Tcp("127.0.0.1:2010".parse().unwrap())).await?;
/// # remote.listen(ProtocolAddr::Udp("0.0.0.0:2011".parse().unwrap())).await?; /// # remote.listen(ProtocolAddr::Udp("127.0.0.1:2011".parse().unwrap())).await?;
/// let p1 = network /// let p1 = network
/// .connect(ProtocolAddr::Tcp("127.0.0.1:2010".parse().unwrap())) /// .connect(ProtocolAddr::Tcp("127.0.0.1:2010".parse().unwrap()))
/// .await?; /// .await?;
@ -397,9 +397,9 @@ impl Network {
/// # std::thread::spawn(fr); /// # std::thread::spawn(fr);
/// block_on(async { /// block_on(async {
/// network /// network
/// .listen(ProtocolAddr::Tcp("0.0.0.0:2020".parse().unwrap())) /// .listen(ProtocolAddr::Tcp("127.0.0.1:2020".parse().unwrap()))
/// .await?; /// .await?;
/// # remote.connect(ProtocolAddr::Tcp("0.0.0.0:2020".parse().unwrap())).await?; /// # remote.connect(ProtocolAddr::Tcp("127.0.0.1:2020".parse().unwrap())).await?;
/// while let Ok(participant) = network.connected().await { /// while let Ok(participant) = network.connected().await {
/// println!("Participant connected: {}", participant.remote_pid()); /// println!("Participant connected: {}", participant.remote_pid());
/// # //skip test here as it would be a endless loop /// # //skip test here as it would be a endless loop
@ -468,7 +468,7 @@ impl Participant {
/// # let (remote, fr) = Network::new(Pid::new()); /// # let (remote, fr) = Network::new(Pid::new());
/// # std::thread::spawn(fr); /// # std::thread::spawn(fr);
/// block_on(async { /// block_on(async {
/// # remote.listen(ProtocolAddr::Tcp("0.0.0.0:2100".parse().unwrap())).await?; /// # remote.listen(ProtocolAddr::Tcp("127.0.0.1:2100".parse().unwrap())).await?;
/// let p1 = network /// let p1 = network
/// .connect(ProtocolAddr::Tcp("127.0.0.1:2100".parse().unwrap())) /// .connect(ProtocolAddr::Tcp("127.0.0.1:2100".parse().unwrap()))
/// .await?; /// .await?;
@ -526,7 +526,7 @@ impl Participant {
/// # let (remote, fr) = Network::new(Pid::new()); /// # let (remote, fr) = Network::new(Pid::new());
/// # std::thread::spawn(fr); /// # std::thread::spawn(fr);
/// block_on(async { /// block_on(async {
/// # remote.listen(ProtocolAddr::Tcp("0.0.0.0:2110".parse().unwrap())).await?; /// # remote.listen(ProtocolAddr::Tcp("127.0.0.1:2110".parse().unwrap())).await?;
/// let p1 = network.connect(ProtocolAddr::Tcp("127.0.0.1:2110".parse().unwrap())).await?; /// let p1 = network.connect(ProtocolAddr::Tcp("127.0.0.1:2110".parse().unwrap())).await?;
/// # let p2 = remote.connected().await?; /// # let p2 = remote.connected().await?;
/// # p2.open(16, Promises::ORDERED | Promises::CONSISTENCY).await?; /// # p2.open(16, Promises::ORDERED | Promises::CONSISTENCY).await?;
@ -581,9 +581,9 @@ impl Participant {
/// # std::thread::spawn(fr); /// # std::thread::spawn(fr);
/// block_on(async { /// block_on(async {
/// network /// network
/// .listen(ProtocolAddr::Tcp("0.0.0.0:2030".parse().unwrap())) /// .listen(ProtocolAddr::Tcp("127.0.0.1:2030".parse().unwrap()))
/// .await?; /// .await?;
/// # let keep_alive = remote.connect(ProtocolAddr::Tcp("0.0.0.0:2030".parse().unwrap())).await?; /// # let keep_alive = remote.connect(ProtocolAddr::Tcp("127.0.0.1:2030".parse().unwrap())).await?;
/// while let Ok(participant) = network.connected().await { /// while let Ok(participant) = network.connected().await {
/// println!("Participant connected: {}", participant.remote_pid()); /// println!("Participant connected: {}", participant.remote_pid());
/// participant.disconnect().await?; /// participant.disconnect().await?;

4
network/tests/integration.rs
View File

@ -78,10 +78,10 @@ fn tcp_and_udp_2_connections() -> std::result::Result<(), Box<dyn std::error::Er
std::thread::spawn(fr); std::thread::spawn(fr);
block_on(async { block_on(async {
remote remote
.listen(ProtocolAddr::Tcp("0.0.0.0:2000".parse().unwrap())) .listen(ProtocolAddr::Tcp("127.0.0.1:2000".parse().unwrap()))
.await?; .await?;
remote remote
.listen(ProtocolAddr::Udp("0.0.0.0:2001".parse().unwrap())) .listen(ProtocolAddr::Udp("127.0.0.1:2001".parse().unwrap()))
.await?; .await?;
let p1 = network let p1 = network
.connect(ProtocolAddr::Tcp("127.0.0.1:2000".parse().unwrap())) .connect(ProtocolAddr::Tcp("127.0.0.1:2000".parse().unwrap()))