summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyle Altendorf <sda@fstab.net>2020-10-07 17:56:54 -0400
committerKyle Altendorf <sda@fstab.net>2020-10-07 17:56:54 -0400
commit76acb4433098c069b21903dec18ad1df5696b4fc (patch)
tree8c152bc58c3aedafec1c134d8aac9d05249f7d1b /src
parentaf3759a50372602be748b126b3390ed38c072713 (diff)
downloadpytest-76acb4433098c069b21903dec18ad1df5696b4fc.tar.gz
Update tests to cover explicit None and "string" as addini() types
Diffstat (limited to 'src')
-rw-r--r--src/_pytest/config/__init__.py2
1 files changed, 1 insertions, 1 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(