test: run kvsd in test

Author: ymgyt

Cargo.lock

@@ -13,15 +13,17 @@ readme      = "README"
 repository  = "https://github.com/ymgyt/syndicationd"
 
 [workspace.dependencies]
-anyhow                             = { version = "1" }
-async-trait                        = { version = "0.1.77" }
-axum                               = { version = "0.7.4" }
-chrono                             = { version = "0.4.31" }
-clap                               = { version = "4.4" }
-feed-rs                            = { version = "1.4" }
-futures-util                       = { version = "0.3.30" }
-graphql_client                     = { version = "0.13.0", default-features = false }
-http                               = { version = "0.2" }                                                                                                   # request use 0.2
+anyhow         = { version = "1" }
+async-trait    = { version = "0.1.77" }
+axum           = { version = "0.7.4" }
+chrono         = { version = "0.4.31" }
+clap           = { version = "4.4" }
+feed-rs        = { version = "1.4" }
+futures-util   = { version = "0.3.30" }
+graphql_client = { version = "0.13.0", default-features = false }
+http           = { version = "0.2" }                              # request use 0.2
+kvsd           = { version = "0.1.2", default-features = false }
+# kvsd                               = { path = "../kvsd" }
 moka                               = { version = "0.12.4", features = ["future"] }
 opentelemetry                      = { version = "0.21.0" }
 opentelemetry-http                 = { version = "0.10.0" }

Cargo.toml

@@ -52,7 +52,9 @@ integration = []
 synd_api  = { path = "../synd_api" }
 synd_test = { path = "../synd_test" }
 
+kvsd         = { workspace = true }
 serial_test  = { version = "3.0.0", default_features = false, features = ["async", "file_locks"] }
+tempdir      = "0.3.7"
 tokio-stream = "0.1.14"
 
 [lints]

crates/synd_term/Cargo.toml

@@ -33,6 +33,8 @@ mod test {
 
         tracing::info!("TEST hello_world run");
 
+        let _kvsd_client = helper::run_kvsd().await?;
+
         let mock_port = 6000;
         let oauth_addr = ("127.0.0.1", mock_port);
         let oauth_listener = TcpListener::bind(oauth_addr).await?;

crates/synd_term/tests/integration.rs

@@ -1,6 +1,10 @@
+use std::future::pending;
+
+use kvsd::client::Api;
 use ratatui::backend::TestBackend;
 use synd_api::{client::github::GithubClient, serve::auth::Authenticator};
 use synd_term::terminal::Terminal;
+use tokio::net::{TcpListener, TcpStream};
 
 pub fn new_test_terminal() -> Terminal {
     let backend = TestBackend::new(80, 20);
@@ -20,11 +24,54 @@ pub fn new_test_terminal() -> Terminal {
 //         * datastore
 //         * fetch cached feed
 //       * authorizer
-pub async fn serve_api(mock_port: u16) -> anyhow::Result<()> {
+#[allow(unused)]
+pub fn serve_api(mock_port: u16) -> anyhow::Result<()> {
     let github_endpoint: &'static str =
         format!("http://localhost:{mock_port}/github/graphql").leak();
-    let github_client = GithubClient::new()?.with_endpoint(&github_endpoint);
+    let github_client = GithubClient::new()?.with_endpoint(github_endpoint);
     let authenticator = Authenticator::new()?.with_client(github_client);
 
     Ok(())
 }
+
+pub async fn run_kvsd() -> anyhow::Result<kvsd::client::tcp::Client<TcpStream>> {
+    let root_dir = temp_dir();
+    let mut config = kvsd::config::Config::default();
+
+    // Setup user credential.
+    config.kvsd.users = vec![kvsd::core::UserEntry {
+        username: "test".into(),
+        password: "test".into(),
+    }];
+    config.server.set_disable_tls(&mut Some(true));
+
+    // Test Server listen addr
+    let addr = ("localhost", 47379);
+
+    let mut initializer = kvsd::config::Initializer::from_config(config);
+
+    initializer.set_root_dir(root_dir.path());
+    initializer.set_listener(TcpListener::bind(addr).await.unwrap());
+
+    initializer.init_dir().await.unwrap();
+
+    let _server_handler = tokio::spawn(initializer.run_kvsd(pending::<()>()));
+
+    // TODO: retry
+    let mut client = kvsd::client::tcp::UnauthenticatedClient::insecure_from_addr(addr.0, addr.1)
+        .await
+        .unwrap()
+        .authenticate("test", "test")
+        .await
+        .unwrap();
+
+    // Ping
+    let ping_duration = client.ping().await.unwrap();
+    assert!(ping_duration.num_nanoseconds().unwrap() > 0);
+
+    Ok(client)
+}
+
+pub fn temp_dir() -> tempdir::TempDir {
+    tempdir::TempDir::new("synd_term").unwrap()
+}

crates/synd_term/tests/test/helper.rs

@@ -32,7 +32,7 @@ test:
 
 # Run integration test
 integration-test:
-  RUST_LOG="synd,integration=debug" cargo nextest run --package synd_term --features integration --test integration --no-capture 
+  RUST_LOG="synd,integration,kvsd=debug" cargo nextest run --package synd_term --features integration --test integration --no-capture 
 
 update-gql-schema:
   @graphql-client introspect-schema http://localhost:5959/graphql \

justfile

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.75.0"
+channel = "1.76.0"