From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sat, 6 Dec 2008 00:22:07 +0000 (-0700)
Subject: setup: remove custom Trial class inside our setup.py and use the setuptools_trial... 
X-Git-Tag: allmydata-tahoe-1.3.0~220
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/flags/webapi.txt?a=commitdiff_plain;h=a56df2587ac827e7d58e7ae99b012285c4552297;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove custom Trial class inside our setup.py and use the setuptools_trial plugin
---

diff --git a/docs/install.html b/docs/install.html
index 6b043c33..3efbf1ea 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -35,7 +35,7 @@
 
     <p>Run <cite>python setup.py build_tahoe</cite> to build and to install the <cite>tahoe</cite> executable into a subdirectory of the current directory named <cite>bin</cite>.</p>
 
-    <p>Run <cite>python trial</cite> to verify that it built correctly and passes all tests.</p>
+    <p>Run <cite>python setup.py trial</cite> to verify that it built correctly and passes all tests.</p>
 
     <p>Run <cite>bin/tahoe --version</cite> to verify that the executable tool runs and prints out the right version number (the "allmydata" version number is the version number of the Tahoe package).</p>
 
diff --git a/setup.py b/setup.py
index 913c0ccd..38359a18 100644
--- a/setup.py
+++ b/setup.py
@@ -86,10 +86,6 @@ from setuptools.command import sdist
 from distutils.core import Command
 from pkg_resources import require
 
-import pkg_resources
-pkg_resources.require('setuptools_trial')
-from setuptools_trial.setuptools_trial import TrialTest
-
 # Make the dependency-version-requirement, which is used by the Makefile at
 # build-time, also available to the app at runtime:
 import shutil
@@ -299,27 +295,6 @@ class BuildTahoe(Command):
             print >>sys.stderr, "'setup.py develop' exited with rc", rc
             sys.exit(rc)
 
-class Trial(TrialTest):
-    # Custom sub-class of the TrialTest class from the setuptools_trial
-    # plugin so that we can ensure certain options are set by default.
-    #
-    # Examples:
-    #  setup.py trial    # run all tests
-    #  setup.py trial -a allmydata.test.test_util   # run some tests
-    #  setup.py trial -a '--reporter=text allmydata.test.test_util' #other args
-
-
-    def initialize_options(self):
-        TrialTest.initialize_options(self)
-
-        # We want to set the reactor to 'poll', because of bug #402
-        # (twisted bug #3218).
-        if sys.platform in ("linux2", "cygwin"):
-            # poll on linux2 to avoid #402 problems with select
-            # poll on cygwin since selectreactor runs out of fds
-            self.reactor = "poll"
-
-
 class MySdist(sdist.sdist):
     """ A hook in the sdist command so that we can determine whether this the
     tarball should be 'SUMO' or not, i.e. whether or not to include the
@@ -383,7 +358,6 @@ setup(name='allmydata-tahoe',
                 "run_with_pythonpath": RunWithPythonPath,
                 "check_auto_deps": CheckAutoDeps,
                 "build_tahoe": BuildTahoe,
-                "trial": Trial,
                 "sdist": MySdist,
                 },
       package_dir = {'':'src'},