Misc. cleanups: findPackages -> find_packages, use standard paths, don't

include --with/--without options on individual commands.


git-svn-id: svn://svn.eby-sarna.com/svnroot/wsgiref@239 571e12c6-e1fa-0310-aee7-ff1267fa46bd

1 files changed, 8 insertions, 8 deletions

diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py
index 0c4a4f1..186310d 100644
--- a/setuptools/tests/__init__.py
+++ b/setuptools/tests/__init__.py
@@ -288,21 +288,21 @@ class FeatureTests(TestCase):
     def testFeatureOptions(self):
         dist = self.dist
         self.failUnless(
-            ('with-dwim',None,'include DWIM') in dist.global_options
+            ('with-dwim',None,'include DWIM') in dist.feature_options
         )
         self.failUnless(
-            ('without-dwim',None,'exclude DWIM (default)') in dist.global_options
+            ('without-dwim',None,'exclude DWIM (default)') in dist.feature_options
         )
         self.failUnless(
-            ('with-bar',None,'include bar (default)') in dist.global_options
+            ('with-bar',None,'include bar (default)') in dist.feature_options
         )
         self.failUnless(
-            ('without-bar',None,'exclude bar') in dist.global_options
+            ('without-bar',None,'exclude bar') in dist.feature_options
         )
-        self.assertEqual(dist.negative_opt['without-foo'],'with-foo')
-        self.assertEqual(dist.negative_opt['without-bar'],'with-bar')
-        self.assertEqual(dist.negative_opt['without-dwim'],'with-dwim')
-        self.failIf('without-baz' in dist.negative_opt)
+        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.failIf('without-baz' in dist.feature_negopt)
 
     def testUseFeatures(self):
         dist = self.dist