From 04af3473b7f68910632c890d0ab167ea3844c4fe Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Wed, 22 Sep 2021 14:05:09 -0700
Subject: [PATCH] pyproject.toml: Merge contents of pytest.ini

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 pyproject.toml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 pytest.ini     | 56 -----------------------------------------------
 2 files changed, 59 insertions(+), 56 deletions(-)
 delete mode 100644 pytest.ini

diff --git a/pyproject.toml b/pyproject.toml
index 9f8a5ed54..d337f151f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,2 +1,61 @@
 [tool.isort]
 known_first_party = ["plinth"]
+
+[tool.pytest.ini_options]
+addopts = "--ds=plinth.tests.data.django_test_settings"
+markers = [
+    "functional",
+    "apps",
+    "avahi",
+    "backups",
+    "bepasty",
+    "bind",
+    "calibre",
+    "cockpit",
+    "config",
+    "coturn",
+    "datetime",
+    "deluge",
+    "dynamicdns",
+    "ejabberd",
+    "essential",
+    "gitweb",
+    "help",
+    "i2p",
+    "ikiwiki",
+    "infinoted",
+    "jsxc",
+    "matrixsynapse",
+    "mediawiki",
+    "minetest",
+    "minidlna",
+    "mldonkey",
+    "monkeysphere",
+    "mumble",
+    "openvpn",
+    "pagekite",
+    "performance",
+    "privoxy",
+    "quassel",
+    "radicale",
+    "roundcube",
+    "samba",
+    "searx",
+    "security",
+    "shadowsocks",
+    "sharing",
+    "skip",
+    "snapshot",
+    "ssh",
+    "sso",
+    "storage",
+    "syncthing",
+    "system",
+    "tahoe",
+    "tor",
+    "transmission",
+    "ttrss",
+    "upgrades",
+    "users",
+    "zoph",
+]
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 4f3ac0700..000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,56 +0,0 @@
-[pytest]
-DJANGO_SETTINGS_MODULE = plinth.tests.data.django_test_settings
-markers = functional
-    apps
-    avahi
-    backups
-    bepasty
-    bind
-    calibre
-    cockpit
-    config
-    coturn
-    datetime
-    deluge
-    dynamicdns
-    ejabberd
-    essential
-    gitweb
-    help
-    i2p
-    ikiwiki
-    infinoted
-    jsxc
-    matrixsynapse
-    mediawiki
-    minetest
-    minidlna
-    mldonkey
-    monkeysphere
-    mumble
-    openvpn
-    pagekite
-    performance
-    privoxy
-    quassel
-    radicale
-    roundcube
-    samba
-    searx
-    security
-    shadowsocks
-    sharing
-    skip
-    snapshot
-    ssh
-    sso
-    storage
-    syncthing
-    system
-    tahoe
-    tor
-    transmission
-    ttrss
-    upgrades
-    users
-    zoph