From e7412dde1f0a3d141839f05f5a06a12df84dc2c6 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 5 May 2021 18:53:28 +0200
Subject: [PATCH] Revert "lib/tests: Add type deprecation tests"

This reverts commit 8b957e3b301d748e6fbbed806d82bd9d4b9d4ac4.
---
 lib/tests/modules.sh                   |  6 ----
 lib/tests/modules/type-deprecation.nix | 39 --------------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 lib/tests/modules/type-deprecation.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 4259c538bb4..2e57c2f8e2a 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -272,12 +272,6 @@ checkConfigError 'A definition for option .fun.\[function body\]. is not of type
 checkConfigOutput "b a" config.result ./functionTo/list-order.nix
 checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
 
-## Type deprecation
-checkConfigError 'The type `types.simple'\'' of option `simple'\'' defined in .* is deprecated. simple shall not be used' config.simple ./type-deprecation.nix
-checkConfigError 'The type `types.infinite'\'' of option `infinite'\'' defined in .* is deprecated. infinite shall not be used' config.infinite ./type-deprecation.nix
-checkConfigError 'The type `types.left'\'' of option `nested'\'' defined in .* is deprecated. left shall not be used' config.nested ./type-deprecation.nix
-checkConfigError 'The type `types.right'\'' of option `nested'\'' defined in .* is deprecated. right shall not be used' config.nested ./type-deprecation.nix
-
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/type-deprecation.nix b/lib/tests/modules/type-deprecation.nix
deleted file mode 100644
index 2d7a1fc9aca..00000000000
--- a/lib/tests/modules/type-deprecation.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, ... }: {
-
-  options.simple = lib.mkOption {
-    type = lib.mkOptionType {
-      name = "simple";
-      deprecationMessage = "simple shall not be used";
-    };
-    default = throw "";
-  };
-
-  options.infinite = lib.mkOption {
-    type =
-      let
-        t = lib.mkOptionType {
-          name = "infinite";
-          deprecationMessage = "infinite shall not be used";
-        };
-        r = lib.types.either t (lib.types.attrsOf r);
-      in r;
-    default = throw "";
-  };
-
-  options.nested = lib.mkOption {
-    type =
-      let
-        left = lib.mkOptionType {
-          name = "left";
-          deprecationMessage = "left shall not be used";
-        };
-        right = lib.mkOptionType {
-          name = "right";
-          deprecationMessage = "right shall not be used";
-        };
-      in lib.types.either left right;
-
-    default = throw "";
-  };
-
-}