From 76acb4433098c069b21903dec18ad1df5696b4fc Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Wed, 7 Oct 2020 17:56:54 -0400
Subject: [PATCH] Update tests to cover explicit None and "string" as addini()
 types

---
 src/_pytest/config/__init__.py |  2 +-
 testing/test_config.py         | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
index 39fbe01a0..7e486e99e 100644
--- a/src/_pytest/config/__init__.py
+++ b/src/_pytest/config/__init__.py
@@ -1402,7 +1402,7 @@ class Config:
         elif type == "bool":
             return _strtobool(str(value).strip())
         else:
-            assert type is None
+            assert type in [None, "string"]
             return value
 
     def _getconftest_pathlist(
diff --git a/testing/test_config.py b/testing/test_config.py
index 582d241a6..f3fa64372 100644
--- a/testing/test_config.py
+++ b/testing/test_config.py
@@ -570,11 +570,17 @@ class TestConfigAPI:
         assert pl[0] == tmpdir
         assert pl[1] == somepath
 
-    def test_addini(self, testdir):
+    @pytest.mark.parametrize("maybe_type", ["not passed", "None", '"string"'])
+    def test_addini(self, testdir, maybe_type):
+        if maybe_type == "not passed":
+            type_string = ""
+        else:
+            type_string = f", {maybe_type}"
+
         testdir.makeconftest(
-            """
+            f"""
             def pytest_addoption(parser):
-                parser.addini("myname", "my new ini value")
+                parser.addini("myname", "my new ini value"{type_string})
         """
         )
         testdir.makeini(