summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/tests
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-05 12:49:59 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-02-05 12:49:59 (GMT)
commitcd0d951a707c0dbecfd45c14b0e6ec7bf83103a2 (patch)
tree3e40b36621bfc2f4140b612d8a6d2ed01d1f9e39 /Lib/distutils/tests
parentbe095b3b9857a5b949dd23b89dac5f5151b252d5 (diff)
parentcd2a6033ac0bafd69a7cba2d132e092127acc895 (diff)
downloadcpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.zip
cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.gz
cpython-cd0d951a707c0dbecfd45c14b0e6ec7bf83103a2.tar.bz2
Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715)
Diffstat (limited to 'Lib/distutils/tests')
-rw-r--r--Lib/distutils/tests/test_bdist_rpm.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_bdist_rpm.py b/Lib/distutils/tests/test_bdist_rpm.py
index 9b0639a..b090b79 100644
--- a/Lib/distutils/tests/test_bdist_rpm.py
+++ b/Lib/distutils/tests/test_bdist_rpm.py
@@ -83,6 +83,10 @@ class BuildRpmTestCase(support.TempdirManager,
dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+ # bug #2945: upload ignores bdist_rpm files
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
def test_no_optimize_flag(self):
# XXX I am unable yet to make this test work without
@@ -122,6 +126,11 @@ class BuildRpmTestCase(support.TempdirManager,
dist_created = os.listdir(os.path.join(pkg_dir, 'dist'))
self.assertTrue('foo-0.1-1.noarch.rpm' in dist_created)
+
+ # bug #2945: upload ignores bdist_rpm files
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.src.rpm'), dist.dist_files)
+ self.assertIn(('bdist_rpm', 'any', 'dist/foo-0.1-1.noarch.rpm'), dist.dist_files)
+
os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm'))
def test_suite():