Skip to content
Merged
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
3 changes: 2 additions & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ init_task = "init"

# Create 'test' alias
[tasks.test]
dependencies = ["tests"]
run_task = "tests"

[tasks.poetry-export-dev]
script_runner = "@shell"
Expand Down Expand Up @@ -255,6 +255,7 @@ args = ["clippy", "--all-targets", "--", "--deny", "warnings"]
[tasks.rust-tests]
dependencies = ["copy-capnp"]
command = "cargo"
cwd = "console_backend"
args = ["test", "--features", "tests", "--", "--nocapture"]

[tasks.rust-type-check]
Expand Down
2 changes: 2 additions & 0 deletions console_backend/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ pub mod observation_tab;
pub mod output;
pub mod piksi_tools_constants;
pub mod process_messages;
#[cfg(not(test))]
#[cfg(all(not(feature = "benches"), not(feature = "tests")))]
pub mod server;
pub mod solution_tab;
pub mod solution_velocity_tab;
Expand Down
19 changes: 3 additions & 16 deletions console_backend/src/server.rs
Original file line number Diff line number Diff line change
@@ -1,30 +1,19 @@
#![allow(dead_code)]
#![allow(unused_imports)]
#![cfg(not(feature = "benches"))]
#![cfg(not(feature = "tests"))]
use capnp::message::Builder;
use capnp::serialize;

use pyo3::exceptions;
use pyo3::prelude::*;
use pyo3::types::PyBytes;

use async_logger::Writer;
use async_logger_log::Logger;
use log::{debug, Record};

use std::fs;
use std::io::{BufReader, Cursor};
use std::net::TcpStream;
use std::sync::{mpsc, Arc, Mutex};
use std::{thread, time::Duration};
use std::sync::mpsc;
use std::thread;

use crate::common_constants as cc;
use crate::console_backend_capnp as m;
use crate::constants::LOG_WRITER_BUFFER_MESSAGE_COUNT;
use crate::log_panel::{splitable_log_formatter, LogPanelWriter};
use crate::process_messages::process_messages;
use crate::types::{ClientSender, MessageSender, ServerState, SharedState, VelocityUnits};
use crate::types::{ClientSender, ServerState, SharedState};
use crate::utils::refresh_ports;

/// The backend server
Expand All @@ -38,7 +27,6 @@ struct ServerEndpoint {
server_send: Option<mpsc::Sender<Vec<u8>>>,
}

#[cfg(not(test))]
#[pymethods]
impl ServerEndpoint {
#[new]
Expand All @@ -61,7 +49,6 @@ impl ServerEndpoint {
}
}

#[cfg(not(test))]
#[pymethods]
impl Server {
#[new]
Expand Down
47 changes: 24 additions & 23 deletions console_backend/tests/log.rs
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
#![allow(dead_code)]
#![allow(unused_imports)]
use log::Level;
use logtest::Logger;
#[cfg(feature = "tests")]
mod log_test_impl {

use console_backend::utils::compute_doppler;
use log::Level;
use logtest::Logger;

#[test]
#[cfg(feature = "tests")]
fn log_test() {
// Start the logger.
use console_backend::utils::compute_doppler;

#[test]
fn log_test() {
// Start the logger.

let mut logger = Logger::start();
let mut logger = Logger::start();

compute_doppler(
123438650.3359375,
123438590.203125,
251746.8,
251746.8,
false,
);
compute_doppler(
123438650.3359375,
123438590.203125,
251746.8,
251746.8,
false,
);

let log_msg = logger.pop().unwrap();
assert_eq!(
log_msg.args(),
"Received two complete observation sets with identical TOW"
);
assert_eq!(log_msg.level(), Level::Warn);
let log_msg = logger.pop().unwrap();
assert_eq!(
log_msg.args(),
"Received two complete observation sets with identical TOW"
);
assert_eq!(log_msg.level(), Level::Warn);
}
}
Loading