fix(ci): remove sqlness state in success (#4313)

* fix(ci): remove sqlness state in success Signed-off-by: Ruihang Xia <[email protected]> * fix regex Signed-off-by: Ruihang Xia <[email protected]> --------- Signed-off-by: Ruihang Xia <[email protected]> Co-authored-by: dennis zhuang <[email protected]>
GreptimeTeam · Jul 8, 2024 · 9686113 · 9686113
1 parent 8e69543
commit 9686113
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/tests/cases/standalone/information_schema/cluster_info.result b/tests/cases/standalone/information_schema/cluster_info.result
@@ -20,22 +20,22 @@ DESC TABLE CLUSTER_INFO;
 -- SQLNESS REPLACE version node_version
 -- SQLNESS REPLACE (\d\.\d\.\d) Version
 -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash
--- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time
+-- SQLNESS REPLACE (\s[\-0-9T:\.]+) Start_time
 -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration
 -- SQLNESS REPLACE [\s\-]+
 SELECT * FROM CLUSTER_INFO;
 
-+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|0|STANDALONE||Version|Hash|Start_time|Duration||+++++++++
++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|Start_time|STANDALONE||Version|Hash|Start_time|Start_timems||+++++++++
 
 -- SQLNESS REPLACE version node_version
 -- SQLNESS REPLACE (\d\.\d\.\d) Version
 -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash
--- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time
+-- SQLNESS REPLACE (\s[\-0-9T:\.]+) Start_time
 -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration
 -- SQLNESS REPLACE [\s\-]+
 SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'STANDALONE';
 
-+++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|0|STANDALONE||Version|Hash|Start_time|Duration||+++++++++
++++++++++|peer_id|peer_type|peer_addr|node_version|git_commit|start_time|uptime|active_time|+++++++++|Start_time|STANDALONE||Version|Hash|Start_time|Start_timems||+++++++++
 
 SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE';
 
@@ -45,7 +45,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE';
 -- SQLNESS REPLACE version node_version
 -- SQLNESS REPLACE (\d\.\d\.\d) Version
 -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash
--- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time
+-- SQLNESS REPLACE (\s[\-0-9T:\.]+) Start_time
 -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration
 -- SQLNESS REPLACE [\s\-]+
 SELECT * FROM CLUSTER_INFO WHERE PEER_ID = 0;

diff --git a/tests/cases/standalone/information_schema/cluster_info.sql b/tests/cases/standalone/information_schema/cluster_info.sql
@@ -5,15 +5,15 @@ DESC TABLE CLUSTER_INFO;
 -- SQLNESS REPLACE version node_version
 -- SQLNESS REPLACE (\d\.\d\.\d) Version
 -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash
--- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time
+-- SQLNESS REPLACE (\s[\-0-9T:\.]+) Start_time
 -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration
 -- SQLNESS REPLACE [\s\-]+
 SELECT * FROM CLUSTER_INFO;
 
 -- SQLNESS REPLACE version node_version
 -- SQLNESS REPLACE (\d\.\d\.\d) Version
 -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash
--- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time
+-- SQLNESS REPLACE (\s[\-0-9T:\.]+) Start_time
 -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration
 -- SQLNESS REPLACE [\s\-]+
 SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE = 'STANDALONE';
@@ -23,7 +23,7 @@ SELECT * FROM CLUSTER_INFO WHERE PEER_TYPE != 'STANDALONE';
 -- SQLNESS REPLACE version node_version
 -- SQLNESS REPLACE (\d\.\d\.\d) Version
 -- SQLNESS REPLACE (\s[a-z0-9]{7}\s) Hash
--- SQLNESS REPLACE (\s[\-0-9T:\.]{23}) Start_time
+-- SQLNESS REPLACE (\s[\-0-9T:\.]+) Start_time
 -- SQLNESS REPLACE ((\d+(s|ms|m)\s)+) Duration
 -- SQLNESS REPLACE [\s\-]+
 SELECT * FROM CLUSTER_INFO WHERE PEER_ID = 0;

diff --git a/tests/runner/src/main.rs b/tests/runner/src/main.rs
@@ -82,7 +82,7 @@ async fn main() {
         .prefix("sqlness")
         .tempdir()
         .unwrap();
-    let data_home = temp_dir.path().to_path_buf();
+    let data_home = temp_dir.into_path();
 
     let config = ConfigBuilder::default()
         .case_dir(util::get_case_dir(args.case_dir))
@@ -107,12 +107,13 @@ async fn main() {
 
     let runner = Runner::new(
         config,
-        Env::new(data_home, args.server_addr, wal, args.bins_dir),
+        Env::new(data_home.clone(), args.server_addr, wal, args.bins_dir),
     );
     runner.run().await.unwrap();
 
-    // skip clean up and exit
-    if args.preserve_state {
-        println!("Preserving state in {:?}", temp_dir.into_path());
+    // clean up and exit
+    if !args.preserve_state {
+        println!("Removing state in {:?}", data_home);
+        tokio::fs::remove_dir_all(data_home).await.unwrap();
     }
 }