Tests: use conftest module to specify testbot fixture location

asfaltboy · zoni · commit c35c525b0037 · 2016-10-26T16:44:02.000+02:00
- imports of testbot are now removed and my linter is happy
diff --git a/conftest.py b/conftest.py
@@ -0,0 +1 @@
+pytest_plugins = ['errbot.backends.test']
diff --git a/tests/commands_test.py b/tests/commands_test.py
@@ -10,8 +10,6 @@
 import pytest
 import tarfile
 
-from errbot.backends.test import testbot  # noqa
-
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'dummy_plugin')
 
 
diff --git a/tests/core_plugins_test.py b/tests/core_plugins_test.py
@@ -1,7 +1,5 @@
 import os
 
-from errbot.backends.test import testbot  # noqa
-
 extra_plugin_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'room_plugin')
 extra_config = {'CORE_PLUGINS': ('Help', 'Utils'), 'BOT_ALT_PREFIXES': ('!',), 'BOT_PREFIX': '$'}
 
diff --git a/tests/dependencies_test.py b/tests/dependencies_test.py
@@ -1,7 +1,5 @@
 import os
 
-from errbot.backends.test import testbot  # noqa
-
 extra_plugin_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'dependent_plugins')
 
 
diff --git a/tests/dynaplug_test.py b/tests/dynaplug_test.py
@@ -1,7 +1,5 @@
 from os import path
 
-from errbot.backends.test import testbot  # noqa
-
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'dyna_plugin')
 
 
diff --git a/tests/flow_e2e_test.py b/tests/flow_e2e_test.py
@@ -3,8 +3,6 @@
 
 import pytest
 
-from errbot.backends.test import testbot
-
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'flow_plugin')
 
 
diff --git a/tests/i18n_test.py b/tests/i18n_test.py
@@ -1,7 +1,5 @@
 # -*- coding=utf-8 -*-
 from os import path
-from errbot.backends.test import testbot
-
 # This is to test end2end i18n behavior.
 
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'i18n_plugin')
diff --git a/tests/mention_test.py b/tests/mention_test.py
@@ -1,4 +1,3 @@
-from errbot.backends.test import testbot
 from os import path
 
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'mention_plugin')
diff --git a/tests/muc_test.py b/tests/muc_test.py
@@ -1,6 +1,6 @@
 import os
 import errbot.backends.base
-from errbot.backends.test import testbot, TestOccupant
+from errbot.backends.test import TestOccupant
 import logging
 log = logging.getLogger(__name__)
 
diff --git a/tests/plugin_config_fail_test.py b/tests/plugin_config_fail_test.py
@@ -1,8 +1,5 @@
 from os import path
 
-import pytest
-from errbot.backends.test import testbot
-
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'fail_config_plugin')
 
 
diff --git a/tests/plugin_config_test.py b/tests/plugin_config_test.py
@@ -1,7 +1,5 @@
 from os import path
 
-import pytest
-from errbot.backends.test import testbot
 
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'config_plugin')
 
diff --git a/tests/syntax_test.py b/tests/syntax_test.py
@@ -1,4 +1,3 @@
-from errbot.backends.test import testbot
 from os import path
 
 extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'syntax_plugin')
diff --git a/tests/templates_test.py b/tests/templates_test.py
@@ -1,5 +1,4 @@
 from os import path
-from errbot.backends.test import testbot
 
 # This is to test end2end i18n behavior.
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+pytest_plugins = ['errbot.backends.test']`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from errbot.backends.test import testbot`
`2`	`1`	`from os import path`
`3`	`2`
`4`	`3`	`extra_plugin_dir = path.join(path.dirname(path.realpath(__file__)), 'mention_plugin')`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`from os import path`
`2`		`-from errbot.backends.test import testbot`
`3`	`2`
`4`	`3`	`# This is to test end2end i18n behavior.`
`5`	`4`