From 5ac3e0119a483c7d9bb43148d2b6f16c546913ff Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 1 Apr 2012 09:15:44 -0400 Subject: Reorganized imports --HG-- branch : distribute extra : rebase_source : b348504ee7341fc2928a786167f33baa136e2b93 --- setuptools/tests/__init__.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index 9af44a88..fec3854d 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -1,19 +1,21 @@ """Tests for the 'setuptools' package""" -from unittest import TestSuite, TestCase, makeSuite, defaultTestLoader -import distutils.core, distutils.cmd +import sys +import os +import doctest +import distutils.core +import distutils.cmd from distutils.errors import DistutilsOptionError, DistutilsPlatformError from distutils.errors import DistutilsSetupError -import setuptools, setuptools.dist -from setuptools import Feature from distutils.core import Extension -extract_constant, get_module_constant = None, None -from setuptools.depends import * -from distutils.version import StrictVersion, LooseVersion -from distutils.util import convert_path -import sys, os.path +from distutils.version import LooseVersion + +import unittest + +import setuptools.dist +from setuptools import Feature +from setuptools.depends import Require, find_module, get_module_constant, extract_constant def additional_tests(): - import doctest, unittest suite = unittest.TestSuite(( doctest.DocFileSuite( os.path.join('tests', 'api_tests.txt'), @@ -40,7 +42,7 @@ def makeSetup(**args): -class DependsTests(TestCase): +class DependsTests(unittest.TestCase): def testExtractConst(self): if not extract_constant: return # skip on non-bytecode platforms @@ -122,7 +124,7 @@ class DependsTests(TestCase): self.assert_(req.is_current(paths)) -class DistroTests(TestCase): +class DistroTests(unittest.TestCase): def setUp(self): self.e1 = Extension('bar.ext',['bar.c']) @@ -245,7 +247,7 @@ class DistroTests(TestCase): -class FeatureTests(TestCase): +class FeatureTests(unittest.TestCase): def setUp(self): self.req = Require('Distutils','1.0.3','distutils') @@ -327,7 +329,7 @@ class FeatureTests(TestCase): SystemExit, makeSetup, features = {'x':Feature('x', remove='y')} ) -class TestCommandTests(TestCase): +class TestCommandTests(unittest.TestCase): def testTestIsCommand(self): test_cmd = makeSetup().get_command_obj('test') -- cgit v1.2.3 From 61942ccf83167298cbd933f1594d59a32f5cf349 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 1 Apr 2012 09:25:00 -0400 Subject: Cleaned up excess whitespace --HG-- branch : distribute extra : rebase_source : 722c3a4c556ba4415c633e74e34fb45f76d8653d --- setuptools/tests/__init__.py | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index fec3854d..7a3d6eb5 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -40,15 +40,13 @@ def makeSetup(**args): distutils.core_setup_stop_after = None - - class DependsTests(unittest.TestCase): def testExtractConst(self): if not extract_constant: return # skip on non-bytecode platforms def f1(): - global x,y,z + global x, y, z x = "test" y = z @@ -64,11 +62,11 @@ class DependsTests(unittest.TestCase): # recognized name, not assigned self.assertEqual(extract_constant(f1.func_code,'z', -1), None) - def testFindModule(self): self.assertRaises(ImportError, find_module, 'no-such.-thing') self.assertRaises(ImportError, find_module, 'setuptools.non-existent') - f,p,i = find_module('setuptools.tests'); f.close() + f,p,i = find_module('setuptools.tests') + f.close() def testModuleExtract(self): if not get_module_constant: return # skip on non-bytecode platforms @@ -137,11 +135,9 @@ class DistroTests(unittest.TestCase): package_dir = {}, ) - def testDistroType(self): self.assert_(isinstance(self.dist,setuptools.dist.Distribution)) - def testExcludePackage(self): self.dist.exclude_package('a') self.assertEqual(self.dist.packages, ['b','c']) @@ -159,12 +155,6 @@ class DistroTests(unittest.TestCase): # test removals from unspecified options makeSetup().exclude_package('x') - - - - - - def testIncludeExclude(self): # remove an extension self.dist.exclude(ext_modules=[self.e1]) @@ -203,9 +193,6 @@ class DistroTests(unittest.TestCase): self.dist.exclude_package('c') self.assert_(not self.dist.has_contents_for('c')) - - - def testInvalidIncludeExclude(self): self.assertRaises(DistutilsSetupError, self.dist.include, nonexistent_option='x' @@ -234,19 +221,6 @@ class DistroTests(unittest.TestCase): ) - - - - - - - - - - - - - class FeatureTests(unittest.TestCase): def setUp(self): @@ -365,8 +339,3 @@ class TestCommandTests(unittest.TestCase): ts5 = makeSetup().get_command_obj('test') ts5.ensure_finalized() self.assertEqual(ts5.test_suite, None) - - - - - -- cgit v1.2.3 From 6d3883d96d604548dc1f6e5229c24595773b0655 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 14 Apr 2012 13:30:09 -0400 Subject: Fixed issue where some functions are excluded from the depends module on certain platforms. --HG-- branch : distribute extra : rebase_source : d689792420ad98950659e80782b4353da3560403 --- setuptools/tests/__init__.py | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index fec3854d..db563766 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -12,8 +12,9 @@ from distutils.version import LooseVersion import unittest import setuptools.dist +import setuptools.depends as dep from setuptools import Feature -from setuptools.depends import Require, find_module, get_module_constant, extract_constant +from setuptools.depends import Require def additional_tests(): suite = unittest.TestSuite(( @@ -45,7 +46,9 @@ def makeSetup(**args): class DependsTests(unittest.TestCase): def testExtractConst(self): - if not extract_constant: return # skip on non-bytecode platforms + if not hasattr(dep, 'extract_constant'): + # skip on non-bytecode platforms + return def f1(): global x,y,z @@ -53,38 +56,43 @@ class DependsTests(unittest.TestCase): y = z # unrecognized name - self.assertEqual(extract_constant(f1.func_code,'q', -1), None) + self.assertEqual(dep.extract_constant(f1.func_code,'q', -1), None) # constant assigned - self.assertEqual(extract_constant(f1.func_code,'x', -1), "test") + self.assertEqual(dep.extract_constant(f1.func_code,'x', -1), "test") # expression assigned - self.assertEqual(extract_constant(f1.func_code,'y', -1), -1) + self.assertEqual(dep.extract_constant(f1.func_code,'y', -1), -1) # recognized name, not assigned - self.assertEqual(extract_constant(f1.func_code,'z', -1), None) + self.assertEqual(dep.extract_constant(f1.func_code,'z', -1), None) def testFindModule(self): - self.assertRaises(ImportError, find_module, 'no-such.-thing') - self.assertRaises(ImportError, find_module, 'setuptools.non-existent') - f,p,i = find_module('setuptools.tests'); f.close() + self.assertRaises(ImportError, dep.find_module, 'no-such.-thing') + self.assertRaises(ImportError, dep.find_module, 'setuptools.non-existent') + f,p,i = dep.find_module('setuptools.tests'); f.close() def testModuleExtract(self): - if not get_module_constant: return # skip on non-bytecode platforms + if not hasattr(dep, 'get_module_constant'): + # skip on non-bytecode platforms + return + from email import __version__ self.assertEqual( - get_module_constant('email','__version__'), __version__ + dep.get_module_constant('email','__version__'), __version__ ) self.assertEqual( - get_module_constant('sys','version'), sys.version + dep.get_module_constant('sys','version'), sys.version ) self.assertEqual( - get_module_constant('setuptools.tests','__doc__'),__doc__ + dep.get_module_constant('setuptools.tests','__doc__'),__doc__ ) def testRequire(self): - if not extract_constant: return # skip on non-bytecode platforms + if not hasattr(dep, 'extract_constant'): + # skip on non-bytecode platformsh + return req = Require('Email','1.0.3','email') -- cgit v1.2.3 From 4c40b36f11a8b4a8025e5ab15d39403c6d4ca88a Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 14 Apr 2012 18:17:54 +0000 Subject: Fixed test failures in the doctests on Python 3. --HG-- branch : distribute extra : rebase_source : e3c57d5c2650be765d7e152e191f7c7a0e7c578d --- setuptools/tests/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index fec3854d..78ac920f 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -1,6 +1,7 @@ """Tests for the 'setuptools' package""" import sys import os +import unittest import doctest import distutils.core import distutils.cmd @@ -9,13 +10,12 @@ from distutils.errors import DistutilsSetupError from distutils.core import Extension from distutils.version import LooseVersion -import unittest - import setuptools.dist from setuptools import Feature from setuptools.depends import Require, find_module, get_module_constant, extract_constant def additional_tests(): + import doctest, unittest suite = unittest.TestSuite(( doctest.DocFileSuite( os.path.join('tests', 'api_tests.txt'), -- cgit v1.2.3 From e743dabde0d60aaeca5c9e4dc5c29ac3ac625646 Mon Sep 17 00:00:00 2001 From: Lennart Regebro Date: Wed, 22 Aug 2012 16:41:06 +0200 Subject: Got rid of deprecated assert_ and assertEquals. --HG-- branch : distribute extra : rebase_source : 9d7032bac7db98e445ab6a46b2610c278c691c2d --- setuptools/tests/__init__.py | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index 54c9902e..eec76efd 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -102,21 +102,21 @@ class DependsTests(unittest.TestCase): from email import __version__ self.assertEqual(req.get_version(), __version__) - self.assert_(req.version_ok('1.0.9')) - self.assert_(not req.version_ok('0.9.1')) - self.assert_(not req.version_ok('unknown')) + self.assertTrue(req.version_ok('1.0.9')) + self.assertTrue(not req.version_ok('0.9.1')) + self.assertTrue(not req.version_ok('unknown')) - self.assert_(req.is_present()) - self.assert_(req.is_current()) + self.assertTrue(req.is_present()) + self.assertTrue(req.is_current()) req = Require('Email 3000','03000','email',format=LooseVersion) - self.assert_(req.is_present()) - self.assert_(not req.is_current()) - self.assert_(not req.version_ok('unknown')) + self.assertTrue(req.is_present()) + self.assertTrue(not req.is_current()) + self.assertTrue(not req.version_ok('unknown')) req = Require('Do-what-I-mean','1.0','d-w-i-m') - self.assert_(not req.is_present()) - self.assert_(not req.is_current()) + self.assertTrue(not req.is_present()) + self.assertTrue(not req.is_current()) req = Require('Tests', None, 'tests', homepage="http://example.com") self.assertEqual(req.format, None) @@ -126,8 +126,8 @@ class DependsTests(unittest.TestCase): self.assertEqual(req.homepage, 'http://example.com') paths = [os.path.dirname(p) for p in __path__] - self.assert_(req.is_present(paths)) - self.assert_(req.is_current(paths)) + self.assertTrue(req.is_present(paths)) + self.assertTrue(req.is_current(paths)) class DistroTests(unittest.TestCase): @@ -144,7 +144,7 @@ class DistroTests(unittest.TestCase): ) def testDistroType(self): - self.assert_(isinstance(self.dist,setuptools.dist.Distribution)) + self.assertTrue(isinstance(self.dist,setuptools.dist.Distribution)) def testExcludePackage(self): self.dist.exclude_package('a') @@ -189,17 +189,17 @@ class DistroTests(unittest.TestCase): dist.exclude(packages=['a'], py_modules=['b'], ext_modules=[self.e2]) def testContents(self): - self.assert_(self.dist.has_contents_for('a')) + self.assertTrue(self.dist.has_contents_for('a')) self.dist.exclude_package('a') - self.assert_(not self.dist.has_contents_for('a')) + self.assertTrue(not self.dist.has_contents_for('a')) - self.assert_(self.dist.has_contents_for('b')) + self.assertTrue(self.dist.has_contents_for('b')) self.dist.exclude_package('b') - self.assert_(not self.dist.has_contents_for('b')) + self.assertTrue(not self.dist.has_contents_for('b')) - self.assert_(self.dist.has_contents_for('c')) + self.assertTrue(self.dist.has_contents_for('c')) self.dist.exclude_package('c') - self.assert_(not self.dist.has_contents_for('c')) + self.assertTrue(not self.dist.has_contents_for('c')) def testInvalidIncludeExclude(self): self.assertRaises(DistutilsSetupError, @@ -253,12 +253,12 @@ class FeatureTests(unittest.TestCase): ) def testDefaults(self): - self.assert_(not + self.assertTrue(not Feature( "test",standard=True,remove='x',available=False ).include_by_default() ) - self.assert_( + self.assertTrue( Feature("test",standard=True,remove='x').include_by_default() ) # Feature must have either kwargs, removes, or require_features @@ -272,33 +272,33 @@ class FeatureTests(unittest.TestCase): def testFeatureOptions(self): dist = self.dist - self.assert_( + self.assertTrue( ('with-dwim',None,'include DWIM') in dist.feature_options ) - self.assert_( + self.assertTrue( ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options ) - self.assert_( + self.assertTrue( ('with-bar',None,'include bar (default)') in dist.feature_options ) - self.assert_( + self.assertTrue( ('without-bar',None,'exclude bar') in dist.feature_options ) self.assertEqual(dist.feature_negopt['without-foo'],'with-foo') self.assertEqual(dist.feature_negopt['without-bar'],'with-bar') self.assertEqual(dist.feature_negopt['without-dwim'],'with-dwim') - self.assert_(not 'without-baz' in dist.feature_negopt) + self.assertTrue(not 'without-baz' in dist.feature_negopt) def testUseFeatures(self): dist = self.dist self.assertEqual(dist.with_foo,1) self.assertEqual(dist.with_bar,0) self.assertEqual(dist.with_baz,1) - self.assert_(not 'bar_et' in dist.py_modules) - self.assert_(not 'pkg.bar' in dist.packages) - self.assert_('pkg.baz' in dist.packages) - self.assert_('scripts/baz_it' in dist.scripts) - self.assert_(('libfoo','foo/foofoo.c') in dist.libraries) + self.assertTrue(not 'bar_et' in dist.py_modules) + self.assertTrue(not 'pkg.bar' in dist.packages) + self.assertTrue('pkg.baz' in dist.packages) + self.assertTrue('scripts/baz_it' in dist.scripts) + self.assertTrue(('libfoo','foo/foofoo.c') in dist.libraries) self.assertEqual(dist.ext_modules,[]) self.assertEqual(dist.require_features, [self.req]) @@ -315,7 +315,7 @@ class TestCommandTests(unittest.TestCase): def testTestIsCommand(self): test_cmd = makeSetup().get_command_obj('test') - self.assert_(isinstance(test_cmd, distutils.cmd.Command)) + self.assertTrue(isinstance(test_cmd, distutils.cmd.Command)) def testLongOptSuiteWNoDefault(self): ts1 = makeSetup(script_args=['test','--test-suite=foo.tests.suite']) -- cgit v1.2.3 From d847dbfeee2b2c85d7bc0a66813c33836a9850fa Mon Sep 17 00:00:00 2001 From: Erik Bray Date: Thu, 6 Sep 2012 15:51:09 -0400 Subject: Adds a fix for issue #318, including a regression test. This also fixes another test that was passing trivially due to *bug* in yet another test, ugh --HG-- branch : distribute extra : rebase_source : 476550766b7b756dced040ad4356b7685d6f062a --- setuptools/tests/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/tests/__init__.py') diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index eec76efd..b6988a08 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -38,7 +38,7 @@ def makeSetup(**args): try: return setuptools.setup(**args) finally: - distutils.core_setup_stop_after = None + distutils.core._setup_stop_after = None class DependsTests(unittest.TestCase): -- cgit v1.2.3