diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-03-02 05:41:25 (GMT) |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-03-02 05:41:25 (GMT) |
commit | d9ca384febde46ebc9210a13e15a2d7c4c021990 (patch) | |
tree | 0e0b74e18b29ede8f024ab99884d19e2c7d1c922 /Lib/distutils/tests/test_bdist_rpm.py | |
parent | ccc5ae7ae13138eb3acf3a15e92983a49e53dd90 (diff) | |
download | cpython-d9ca384febde46ebc9210a13e15a2d7c4c021990.zip cpython-d9ca384febde46ebc9210a13e15a2d7c4c021990.tar.gz cpython-d9ca384febde46ebc9210a13e15a2d7c4c021990.tar.bz2 |
Merged revisions 70094 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70094 | tarek.ziade | 2009-03-02 06:38:44 +0100 (Mon, 02 Mar 2009) | 1 line
removing the force-optimized option as discussed in #1533164
........
Diffstat (limited to 'Lib/distutils/tests/test_bdist_rpm.py')
-rw-r--r-- | Lib/distutils/tests/test_bdist_rpm.py | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py index ff40628..2d84007 100644 --- a/Lib/distutils/tests/test_bdist_rpm.py +++ b/Lib/distutils/tests/test_bdist_rpm.py @@ -109,8 +109,6 @@ class BuildRpmTestCase(support.TempdirManager, cmd = bdist_rpm(dist) cmd.fix_python = True - # running with force-optimize = 1 - # and quiet = 1 cmd.quiet = 1 cmd.ensure_finalized() cmd.run() @@ -119,29 +117,6 @@ class BuildRpmTestCase(support.TempdirManager, self.assert_('foo-0.1-1.noarch.rpm' in dist_created) os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm')) - # XXX I am unable yet to make this test work without - # spurious stderr output - # so returning until distutils.spawn acts better - return - - # running with force-optimize = 0 - cmd.force_optimize = 0 - try: - # XXX How to prevent the spawned - # rpmbuild command to display errors ? - # this can be a problem for buildbots - cmd.ensure_finalized() - cmd.run() - except DistutilsExecError: - # happens only under Fedora/RedHat - # and some flavors of Linux - # otherwise it's a bug - if sys.platform == 'linux2': - return - - dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - self.assert_('foo-0.1-1.noarch.rpm' in dist_created) - def test_suite(): return unittest.makeSuite(BuildRpmTestCase) |