Blame SOURCES/fix-pytest3.patch
|
rdobuilder |
aa9e2f |
From e48a9096c90686245d2e00f7957fd2058eb8101d Mon Sep 17 00:00:00 2001
|
|
rdobuilder |
aa9e2f |
From: Julien Enselme <julien.enselme@centrale-marseille.fr>
|
|
rdobuilder |
aa9e2f |
Date: Sat, 1 Oct 2016 20:41:59 +0200
|
|
rdobuilder |
aa9e2f |
Subject: [PATCH] Fix tests to run on pytest 3 and pytest 2
|
|
rdobuilder |
aa9e2f |
|
|
rdobuilder |
aa9e2f |
---
|
|
rdobuilder |
aa9e2f |
test/conftest.py | 2 --
|
|
rdobuilder |
aa9e2f |
1 file changed, 2 deletions(-)
|
|
rdobuilder |
aa9e2f |
|
|
rdobuilder |
aa9e2f |
diff --git a/test/conftest.py b/test/conftest.py
|
|
rdobuilder |
aa9e2f |
index a79a27f..4a225c8 100644
|
|
rdobuilder |
aa9e2f |
--- a/test/conftest.py
|
|
rdobuilder |
aa9e2f |
+++ b/test/conftest.py
|
|
rdobuilder |
aa9e2f |
@@ -1,7 +1,5 @@
|
|
rdobuilder |
aa9e2f |
import pytest
|
|
rdobuilder |
aa9e2f |
|
|
rdobuilder |
aa9e2f |
-pytest_plugins = ""
|
|
rdobuilder |
aa9e2f |
-
|
|
rdobuilder |
aa9e2f |
# here's a little voodoo -- any generic tests depend on this 'framework'
|
|
rdobuilder |
aa9e2f |
# fixture, which (sneakily using internal-only APIs) ensures that each
|
|
rdobuilder |
aa9e2f |
# tests runs twice: once enabled for Twisted and once enabled for
|