Merge.

--HG--
branch : distribute
extra : rebase_source : 0102b3983fb3f3201c8d2819b5a1120da2cc0047

4 files changed, 1 insertions, 33 deletions

diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index daccaba9..b2ab7acc 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -35,7 +35,7 @@ class IndexServer(HTTPServer):
     def stop(self):
         "Stop the server"
 
-        # Let the server finish the last request adn wait for a new one.
+        # Let the server finish the last request and wait for a new one.
         time.sleep(0.1)
 
         # self.shutdown is not supported on python < 2.6, so just
diff --git a/tests/python3.3_bdist_egg_test/module.py b/tests/python3.3_bdist_egg_test/module.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/python3.3_bdist_egg_test/module.py
+++ /dev/null
diff --git a/tests/python3.3_bdist_egg_test/setup.py b/tests/python3.3_bdist_egg_test/setup.py
deleted file mode 100644
index 04caea74..00000000
--- a/tests/python3.3_bdist_egg_test/setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from setuptools import setup
-
-setup(
-    name='python3.3_bdist_egg_test',
-    version='0.0.0',
-    description='Test',
-    license='BSD',
-    py_modules=['module'],
-    author='Marc Abramowitz',
-    author_email='marc@marc-abramowitz.com',
-    url='https://bitbucket.org/msabramo/python3.3_bdist_egg_test',
-    # zip_safe=False,
-)
diff --git a/tests/test_python33_bdist_egg.py b/tests/test_python33_bdist_egg.py
deleted file mode 100644
index 9f32470a..00000000
--- a/tests/test_python33_bdist_egg.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import sys
-import os
-import unittest
-
-CURDIR = os.path.abspath(os.path.dirname(__file__))
-TOPDIR = os.path.split(CURDIR)[0]
-sys.path.insert(0, TOPDIR)
-
-from distribute_setup import _python_cmd
-
-class TestPython33BdistEgg(unittest.TestCase):
-
-    def test_build_egg(self):
-        os.chdir(os.path.join(CURDIR, 'python3.3_bdist_egg_test'))
-        self.assertTrue(_python_cmd("setup.py", "bdist_egg"))
-
-
-if __name__ == '__main__':
-    unittest.main()