Fix deadpool-memcached

Author: bikeshedder

.devcontainer/.env

@@ -14,4 +14,4 @@ REDIS_SENTINEL__MASTER_NAME=mymaster
 
 AMQP__URL=amqp://deadpool:deadpool@rabbitmq:5672/deadpool
 
-MEMCACHED__ADDR=memcached:11211
+MEMCACHED__ADDR=tcp://memcached:11211

.devcontainer/compose.yml

@@ -65,6 +65,9 @@ services:
     volumes:
       - rabbitmq-data:/var/lib/rabbitmq
 
+  memcached:
+    image: memcached:1.6
+
 volumes:
   postgres-data:
   redis-data:

.github/workflows/deadpool-memcached.yml

@@ -67,14 +67,19 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
-    services: {}
+    services:
+      rabbitmq:
+        image: memcached:1.6
+        ports:
+          - 11211:11211
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
-      - env: {}
+      - env:
+          MEMCACHED__ADDR: tcp://127.0.0.1:11211
         run: cargo test --all-features
 name: deadpool-memcached
 "on":

crates/deadpool-memcached/Cargo.toml

@@ -36,5 +36,8 @@ deadpool = { path = "../deadpool", version = "0.12.0", default-features = false,
 # again.
 tokio = { version = "1.29", default-features = false, features = ["net"] }
 
+[dev-dependencies]
+tokio = { version = "1.29", features = ["macros", "rt-multi-thread"] }
+
 [package.metadata.cargo-machete]
 ignored = ["tokio"]

crates/deadpool-memcached/ci.config.yml

@@ -1 +1,9 @@
 backend: async-memcached
+test:
+  services:
+    rabbitmq:
+      image: memcached:1.6
+      ports:
+        - 11211:11211
+  env:
+    MEMCACHED__ADDR: tcp://127.0.0.1:11211

crates/deadpool-memcached/src/lib.rs

@@ -17,7 +17,13 @@ type RecycleResult = deadpool::managed::RecycleResult<Error>;
 type ConfigError = Infallible;
 
 pub use deadpool::managed::reexports::*;
-deadpool::managed_reexports!("memcached", Manager, Client, Error, ConfigError);
+deadpool::managed_reexports!(
+    "memcached",
+    Manager,
+    deadpool::managed::Object<Manager>,
+    Error,
+    ConfigError
+);
 
 /// The manager for creating and recyling memcache connections
 pub struct Manager {
@@ -26,8 +32,8 @@ pub struct Manager {
 
 impl Manager {
     /// Create a new manager for the given address.
-    pub fn new(addr: String) -> Self {
-        Self { addr }
+    pub fn new(addr: impl Into<String>) -> Self {
+        Self { addr: addr.into() }
     }
 }
 

crates/deadpool-memcached/tests/basic.rs

@@ -0,0 +1,25 @@
+//! Basic tests for deadpool-memcached
+use std::env;
+
+use async_memcached::AsciiProtocol;
+use deadpool_memcached::{Manager, Pool};
+
+fn create_pool() -> Pool {
+    let addr = env::var("MEMCACHED__ADDR").unwrap();
+    let manager = Manager::new(addr);
+    Pool::builder(manager).build().unwrap()
+}
+
+#[tokio::test]
+async fn test_set_get() {
+    let test_key = "test:basic:test_set_get";
+    let test_value = "answer_42";
+    let pool = create_pool();
+    let mut conn = pool.get().await.unwrap();
+    let _ = conn.delete(test_key).await;
+    assert_eq!(conn.get(test_key).await.unwrap(), None);
+    conn.set(test_key, test_value, None, None).await.unwrap();
+    let value =
+        String::from_utf8(conn.get(test_key).await.unwrap().unwrap().data.unwrap()).unwrap();
+    assert_eq!(value, test_value);
+}