Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r2154:3b9f80a475ee Date: 2015-06-01 19:25 +0200 http://bitbucket.org/cffi/cffi/changeset/3b9f80a475ee/
Log: Issue #204: Spinkle "--no-user-cfg" in this test to avoid getting confusion from ~/.pydistutils.cfg. diff --git a/testing/cffi1/test_zdist.py b/testing/cffi1/test_zdist.py --- a/testing/cffi1/test_zdist.py +++ b/testing/cffi1/test_zdist.py @@ -44,7 +44,8 @@ import setuptools except ImportError: py.test.skip("setuptools not found") - subprocess.check_call([self.executable, 'setup.py', 'egg_info'], + subprocess.check_call([self.executable, 'setup.py', '--no-user-cfg', + 'egg_info'], cwd=self.rootdir) TestDist._setuptools_ready = True @@ -242,7 +243,7 @@ @chdir_to_tmp def test_distutils_api_1(self): self._make_distutils_api() - self.run(["setup.py", "build"]) + self.run(["setup.py", "--no-user-cfg", "build"]) self.check_produced_files({'setup.py': None, 'build': '?', 'src': {'pack1': {'__init__.py': None}}}) @@ -250,7 +251,7 @@ @chdir_to_tmp def test_distutils_api_2(self): self._make_distutils_api() - self.run(["setup.py", "build_ext", "-i"]) + self.run(["setup.py", "--no-user-cfg", "build_ext", "-i"]) self.check_produced_files({'setup.py': None, 'build': '?', 'src': {'pack1': {'__init__.py': None, @@ -281,7 +282,7 @@ @chdir_to_tmp def test_setuptools_abi_1(self): self._make_setuptools_abi() - self.run(["setup.py", "build"]) + self.run(["setup.py", "--no-user-cfg", "build"]) self.check_produced_files({'setup.py': None, 'build': '?', 'src0': {'pack2': {'__init__.py': None, @@ -290,7 +291,7 @@ @chdir_to_tmp def test_setuptools_abi_2(self): self._make_setuptools_abi() - self.run(["setup.py", "build_ext", "-i"]) + self.run(["setup.py", "--no-user-cfg", "build_ext", "-i"]) self.check_produced_files({'setup.py': None, 'src0': {'pack2': {'__init__.py': None, '_build.py': None, @@ -321,7 +322,7 @@ @chdir_to_tmp def test_setuptools_api_1(self): self._make_setuptools_api() - self.run(["setup.py", "build"]) + self.run(["setup.py", "--no-user-cfg", "build"]) self.check_produced_files({'setup.py': None, 'build': '?', 'src1': {'pack3': {'__init__.py': None, @@ -330,7 +331,7 @@ @chdir_to_tmp def test_setuptools_api_2(self): self._make_setuptools_api() - self.run(["setup.py", "build_ext", "-i"]) + self.run(["setup.py", "--no-user-cfg", "build_ext", "-i"]) self.check_produced_files({'setup.py': None, 'build': '?', 'src1': {'pack3': {'__init__.py': None, _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit