Merge pull request #531 from tursodatabase/enable-sim-tests

enable sim tests in CI
tursodatabase · Oct 30, 2023 · 9cecb0e · 9cecb0e
2 parents 9e8d488 + c1c7df1
commit 9cecb0e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/libsql-server/Cargo.toml b/libsql-server/Cargo.toml
@@ -70,23 +70,23 @@ hyper-rustls = { git = "https://github.com/rustls/hyper-rustls.git", rev = "163b
 rustls-pemfile = "1.0.3"
 rustls = "0.21.7"
 async-stream = "0.3.5"
-libsql = { path = "../libsql/", optional = true }
 metrics = "0.21.1"
 metrics-exporter-prometheus = "0.12.1"
 
 [dev-dependencies]
-proptest = "1.0.0"
-rand = "0.8.5"
-tempfile = "3.3.0"
-insta = { version = "1.26.0", features = ["json"] }
 arbitrary = { version = "1.3.0", features = ["derive_arbitrary"] }
-libsql-client = { version = "0.6.5", default-features = false, features = ["reqwest_backend"] }
-url = "2.3"
-env_logger = "0.10"
 aws-config = "0.55"
 aws-sdk-s3 = "0.28"
-turmoil = "0.5.6"
+env_logger = "0.10"
 hyper = { version = "0.14", features = ["client"] }
+insta = { version = "1.26.0", features = ["json"] }
+libsql = { path = "../libsql/" }
+libsql-client = { version = "0.6.5", default-features = false, features = ["reqwest_backend"] }
+proptest = "1.0.0"
+rand = "0.8.5"
+tempfile = "3.3.0"
+turmoil = "0.5.6"
+url = "2.3"
 
 [build-dependencies]
 prost-build = "0.12.0"
@@ -98,7 +98,6 @@ vergen = { version = "8", features = ["build", "git", "gitcl"] }
 default = []
 unix-excl-vfs = ["sqld-libsql-bindings/unix-excl-vfs"]
 debug-tools = ["console-subscriber", "rusqlite/trace", "tokio/tracing"]
-sim-tests = ["libsql"]
 wasm-udfs = ["rusqlite/libsql-wasm-experimental"]
 
 
diff --git a/libsql-server/tests/embedded_replica/mod.rs b/libsql-server/tests/embedded_replica/mod.rs
@@ -41,6 +41,7 @@ fn make_primary(sim: &mut Sim, path: PathBuf) {
 }
 
 #[test]
+#[ignore = "fixed by #477"]
 fn embedded_replica() {
     let mut sim = Builder::new().build();
 

diff --git a/libsql-server/tests/tests.rs b/libsql-server/tests/tests.rs
@@ -1,4 +1,3 @@
-#![cfg(feature = "sim-tests")]
 #![allow(clippy::disallowed_names)]
 
 mod cluster;

diff --git a/libsql/src/lib.rs b/libsql/src/lib.rs
@@ -87,6 +87,7 @@ cfg_core! {
     mod local;
 
     pub use local::{version, version_number, RowsFuture};
+    pub use database::OpenFlags;
 }
 
 pub mod params;
@@ -122,7 +123,7 @@ cfg_hrana! {
 
 pub use self::{
     connection::Connection,
-    database::{Database, OpenFlags},
+    database::Database,
     rows::{Column, Row, Rows},
     statement::Statement,
     transaction::{Transaction, TransactionBehavior},