From c2561ca160ea3cfa18e5ff50b1e6cb789bc8681b Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Mon, 6 May 2013 17:35:09 -0300 Subject: [PATCH] use get_testenv() shortcut instead of get_pythonpath() --- scrapy/tests/test_cmdline/__init__.py | 6 ++---- scrapy/tests/test_commands.py | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scrapy/tests/test_cmdline/__init__.py b/scrapy/tests/test_cmdline/__init__.py index 06db5824d..fc74aaf50 100644 --- a/scrapy/tests/test_cmdline/__init__.py +++ b/scrapy/tests/test_cmdline/__init__.py @@ -1,15 +1,13 @@ import sys -import os from subprocess import Popen, PIPE import unittest -from scrapy.utils.test import get_pythonpath +from scrapy.utils.test import get_testenv class CmdlineTest(unittest.TestCase): def setUp(self): - self.env = os.environ.copy() - self.env['PYTHONPATH'] = get_pythonpath() + self.env = get_testenv() self.env['SCRAPY_SETTINGS_MODULE'] = 'scrapy.tests.test_cmdline.settings' def _execute(self, *new_args, **kwargs): diff --git a/scrapy/tests/test_commands.py b/scrapy/tests/test_commands.py index 1d749a0d0..0389d1765 100644 --- a/scrapy/tests/test_commands.py +++ b/scrapy/tests/test_commands.py @@ -9,7 +9,7 @@ from tempfile import mkdtemp from twisted.trial import unittest from scrapy.utils.python import retry_on_eintr -from scrapy.utils.test import get_pythonpath +from scrapy.utils.test import get_testenv class ProjectTest(unittest.TestCase): project_name = 'testproject' @@ -19,8 +19,7 @@ class ProjectTest(unittest.TestCase): self.cwd = self.temp_path self.proj_path = join(self.temp_path, self.project_name) self.proj_mod_path = join(self.proj_path, self.project_name) - self.env = os.environ.copy() - self.env['PYTHONPATH'] = get_pythonpath() + self.env = get_testenv() def tearDown(self): rmtree(self.temp_path)