From 381eb9a5a1dc530ce864ac2b3dc8eb0d454f1bc9 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 22 Jul 2022 18:55:52 +0200
Subject: [PATCH] Fix tests

---
 Cargo.lock              | 22 +---------------------
 src/garage/Cargo.toml   |  2 +-
 src/garage/tests/lib.rs |  3 +++
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 260ae907..d54cabd0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -618,16 +618,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "crypto-mac"
 version = "0.11.1"
@@ -1006,7 +996,7 @@ dependencies = [
  "garage_util 0.7.0",
  "garage_web",
  "hex",
- "hmac 0.10.1",
+ "hmac 0.12.1",
  "http",
  "hyper",
  "kuska-sodiumoxide",
@@ -1510,16 +1500,6 @@ dependencies = [
  "itertools 0.4.19",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac 0.10.1",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "hmac"
 version = "0.11.0"
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml
index 80802a16..2cb8ec46 100644
--- a/src/garage/Cargo.toml
+++ b/src/garage/Cargo.toml
@@ -63,7 +63,7 @@ prometheus = "0.13"
 aws-sdk-s3 = "0.8"
 chrono = "0.4"
 http = "0.2"
-hmac = "0.10"
+hmac = "0.12"
 hyper = { version = "0.14", features = ["client", "http1", "runtime"] }
 sha2 = "0.10"
 
diff --git a/src/garage/tests/lib.rs b/src/garage/tests/lib.rs
index 0106ad10..99aa1d58 100644
--- a/src/garage/tests/lib.rs
+++ b/src/garage/tests/lib.rs
@@ -3,5 +3,8 @@ mod common;
 
 mod admin;
 mod bucket;
+
+#[cfg(feature="k2v")]
 mod k2v;
+
 mod s3;