fix tests for Ceph RADOS and fix complete.rs

core/src/layers/complete.rs

@@ -522,6 +522,8 @@ where
             Error::new(ErrorKind::Unexpected, "writer has been closed or aborted")
         })?;
 
+        // we must return `Err` before setting inner to None; otherwise,
+        // we won't be able to retry `close` in `RetryLayer`.
         let ret = w.close().await?;
         self.inner = None;
 
@@ -557,9 +559,9 @@ where
             Error::new(ErrorKind::Unexpected, "writer has been closed or aborted")
         })?;
 
-        let ret = w.close();
+        let ret = w.close()?;
         self.inner = None;
 
-        ret
+        Ok(ret)
     }
 }

core/tests/behavior/async_write.rs

@@ -617,7 +617,12 @@ pub async fn test_writer_return_metadata(op: Operator) -> Result<()> {
         );
     }
     if let Some(etag) = meta.etag() {
-        assert_eq!(stat_meta.etag().expect("etag must exist"), etag);
+        // workaround for Ceph RADOS Gateway
+        let mut etag = etag.to_string();
+        if !etag.starts_with("\"") {
+            etag = format!("\"{}\"", etag);
+        }
+        assert_eq!(stat_meta.etag().expect("etag must exist"), &etag);
     }
     if let Some(version) = meta.version() {
         assert_eq!(stat_meta.version().expect("version must exist"), version);