CSEC_PUBLIC/hayabusa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into 703-add-various-os-builds-to-ci-tests

Browse Source
This commit is contained in:
DastInDark
2022-09-22 13:20:51 +09:00
parent a5dda8ca1b 061447a26b
commit 02e95d07ce
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/rust.yml vendored
View File

@@ -47,5 +47,4 @@ jobs:
- name: i686-windows(msvc) Build - name: i686-windows(msvc) Build
run: cargo check --verbose --target i686-pc-windows-msvc run: cargo check --verbose --target i686-pc-windows-msvc
- name: Run tests - name: Run tests
run: cargo test --verbose run: RUST_TEST_THREADS=1 cargo test --verbose

1
src/detections/message.rs
View File

@@ -625,7 +625,6 @@ mod tests {
} }
} }
#[ignore]
#[test] #[test]
fn test_insert_message_race_condition() { fn test_insert_message_race_condition() {
MESSAGES.clear(); MESSAGES.clear();

8
src/detections/pivot.rs
View File

@@ -91,9 +91,9 @@ mod tests {
use crate::detections::pivot::PIVOT_KEYWORD; use crate::detections::pivot::PIVOT_KEYWORD;
use serde_json; use serde_json;
//PIVOT_KEYWORDはグローバルなので、他の関数の影響も考慮する必要がある。
#[test] #[test]
fn insert_pivot_keyword_local_ip4() { fn insert_pivot_keyword_local_ip4() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {
@@ -119,6 +119,7 @@ mod tests {
#[test] #[test]
fn insert_pivot_keyword_ip4() { fn insert_pivot_keyword_ip4() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {
@@ -144,6 +145,7 @@ mod tests {
#[test] #[test]
fn insert_pivot_keyword_ip_empty() { fn insert_pivot_keyword_ip_empty() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {
@@ -169,6 +171,7 @@ mod tests {
#[test] #[test]
fn insert_pivot_keyword_local_ip6() { fn insert_pivot_keyword_local_ip6() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {
@@ -194,6 +197,7 @@ mod tests {
#[test] #[test]
fn insert_pivot_keyword_level_infomational() { fn insert_pivot_keyword_level_infomational() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {
@@ -219,6 +223,7 @@ mod tests {
#[test] #[test]
fn insert_pivot_keyword_level_low() { fn insert_pivot_keyword_level_low() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {
@@ -244,6 +249,7 @@ mod tests {
#[test] #[test]
fn insert_pivot_keyword_level_none() { fn insert_pivot_keyword_level_none() {
PIVOT_KEYWORD.write().unwrap().clear();
load_pivot_keywords("test_files/config/pivot_keywords.txt"); load_pivot_keywords("test_files/config/pivot_keywords.txt");
let record_json_str = r#" let record_json_str = r#"
{ {