divmod-dev team mailing list archive

[Tristan Seligmann <mithrandi@xxxxxxxxxxxxx>]

Tristan Seligmann has proposed merging lp:~divmod-dev/divmod.org/1269552-test_reactorSelection-PYTHONPATH into lp:divmod.org.

Requested reviews:
  Divmod-dev (divmod-dev)

For more details, see:
https://code.launchpad.net/~divmod-dev/divmod.org/1269552-test_reactorSelection-PYTHONPATH/+merge/201834
-- 
https://code.launchpad.net/~divmod-dev/divmod.org/1269552-test_reactorSelection-PYTHONPATH/+merge/201834
Your team Divmod-dev is requested to review the proposed merge of lp:~divmod-dev/divmod.org/1269552-test_reactorSelection-PYTHONPATH into lp:divmod.org.

=== modified file 'Axiom/axiom/test/test_axiomatic.py'
--- Axiom/axiom/test/test_axiomatic.py	2009-06-22 20:54:01 +0000
+++ Axiom/axiom/test/test_axiomatic.py	2014-01-15 19:25:23 +0000
@@ -312,14 +312,7 @@
             "reactor class: <class 'twisted.internet.selectreactor.SelectReactor'>"]
         proto, complete = AxiomaticStartProcessProtocol.protocolAndDeferred(expected)
 
-        # Make sure the version of Axiom under test is found by the child
-        # process.
-        import axiom, epsilon
         environ = os.environ.copy()
-        environ['PYTHONPATH'] = os.pathsep.join([
-            FilePath(epsilon.__file__).parent().parent().path,
-            FilePath(axiom.__file__).parent().parent().path,
-            environ['PYTHONPATH']])
         reactor.spawnProcess(proto, sys.executable, argv, env=environ)
         return complete