Merge 3.2

This commit is contained in:
Éric Araujo 2012-03-05 16:24:07 +01:00
commit 6a59b70cba
8 changed files with 24 additions and 15 deletions

View file

@ -1,12 +1,11 @@
"""Tests for distutils.command.bdist_msi."""
import unittest
import sys
import unittest
from test.support import run_unittest
from distutils.tests import support
@unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
@unittest.skipUnless(sys.platform == 'win32', 'these tests require Windows')
class BDistMSITestCase(support.TempdirManager,
support.LoggingSilencer,
unittest.TestCase):
@ -14,9 +13,18 @@ class BDistMSITestCase(support.TempdirManager,
def test_minimal(self):
# minimal test XXX need more tests
from distutils.command.bdist_msi import bdist_msi
pkg_pth, dist = self.create_dist()
project_dir, dist = self.create_dist()
cmd = bdist_msi(dist)
cmd.ensure_finalized()
cmd.run()
bdists = os.listdir(os.path.join(project_dir, 'dist'))
self.assertEqual(bdists, ['foo-0.1.msi'])
# bug #13719: upload ignores bdist_msi files
self.assertEqual(dist.dist_files,
[('bdist_msi', 'any', 'dist/foo-0.1.msi')])
def test_suite():
return unittest.makeSuite(BDistMSITestCase)