Merge branch 'main' into 703-add-various-os-builds-to-ci-tests
This commit is contained in:
3
.github/workflows/rust.yml
vendored
3
.github/workflows/rust.yml
vendored
@@ -47,5 +47,4 @@ jobs:
|
||||
- name: i686-windows(msvc) Build
|
||||
run: cargo check --verbose --target i686-pc-windows-msvc
|
||||
- name: Run tests
|
||||
run: cargo test --verbose
|
||||
|
||||
run: RUST_TEST_THREADS=1 cargo test --verbose
|
||||
@@ -625,7 +625,6 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[ignore]
|
||||
#[test]
|
||||
fn test_insert_message_race_condition() {
|
||||
MESSAGES.clear();
|
||||
|
||||
@@ -91,9 +91,9 @@ mod tests {
|
||||
use crate::detections::pivot::PIVOT_KEYWORD;
|
||||
use serde_json;
|
||||
|
||||
//PIVOT_KEYWORDはグローバルなので、他の関数の影響も考慮する必要がある。
|
||||
#[test]
|
||||
fn insert_pivot_keyword_local_ip4() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
@@ -119,6 +119,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_pivot_keyword_ip4() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
@@ -144,6 +145,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_pivot_keyword_ip_empty() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
@@ -169,6 +171,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_pivot_keyword_local_ip6() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
@@ -194,6 +197,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_pivot_keyword_level_infomational() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
@@ -219,6 +223,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_pivot_keyword_level_low() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
@@ -244,6 +249,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn insert_pivot_keyword_level_none() {
|
||||
PIVOT_KEYWORD.write().unwrap().clear();
|
||||
load_pivot_keywords("test_files/config/pivot_keywords.txt");
|
||||
let record_json_str = r#"
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user