r47267 - we should instead use -m
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org Sat, 16 Apr 2016 23:47:04 -0600 (MDT)
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Sat Apr 16 23:46:58 2016
New Revision: 47267
Removed:
branches/cov-subprocess-8266/twisted/test/_preamble.py
Modified:
branches/cov-subprocess-8266/.coveragerc
branches/cov-subprocess-8266/twisted/test/stdio_test_consumer.py
branches/cov-subprocess-8266/twisted/test/stdio_test_halfclose.py
branches/cov-subprocess-8266/twisted/test/stdio_test_hostpeer.py
branches/cov-subprocess-8266/twisted/test/stdio_test_lastwrite.py
branches/cov-subprocess-8266/twisted/test/stdio_test_loseconn.py
branches/cov-subprocess-8266/twisted/test/stdio_test_producer.py
branches/cov-subprocess-8266/twisted/test/stdio_test_write.py
branches/cov-subprocess-8266/twisted/test/stdio_test_writeseq.py
branches/cov-subprocess-8266/twisted/test/test_stdio.py
Log:
we should instead use -m
Modified: branches/cov-subprocess-8266/.coveragerc
==============================================================================
--- branches/cov-subprocess-8266/.coveragerc (original)
+++ branches/cov-subprocess-8266/.coveragerc Sat Apr 16 23:46:58 2016
@@ -1,9 +1,7 @@
[run]
branch = True
parallel = True
-include =
- */twisted/*
- twisted/*
+source = twisted
[paths]
source=
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_consumer.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_consumer.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_consumer.py Sat Apr 16 23:46:58 2016
@@ -10,7 +10,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.python import log, reflect
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_halfclose.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_halfclose.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_halfclose.py Sat Apr 16 23:46:58 2016
@@ -11,7 +11,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from zope.interface import implementer
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_hostpeer.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_hostpeer.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_hostpeer.py Sat Apr 16 23:46:58 2016
@@ -10,7 +10,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.internet import stdio, protocol
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_lastwrite.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_lastwrite.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_lastwrite.py Sat Apr 16 23:46:58 2016
@@ -11,7 +11,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.internet.protocol import Protocol
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_loseconn.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_loseconn.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_loseconn.py Sat Apr 16 23:46:58 2016
@@ -10,7 +10,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.internet.error import ConnectionDone
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_producer.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_producer.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_producer.py Sat Apr 16 23:46:58 2016
@@ -10,7 +10,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.internet import stdio, protocol
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_write.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_write.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_write.py Sat Apr 16 23:46:58 2016
@@ -10,7 +10,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.internet import stdio, protocol
Modified: branches/cov-subprocess-8266/twisted/test/stdio_test_writeseq.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/stdio_test_writeseq.py (original)
+++ branches/cov-subprocess-8266/twisted/test/stdio_test_writeseq.py Sat Apr 16 23:46:58 2016
@@ -10,7 +10,6 @@
from __future__ import absolute_import, division
-__import__('_preamble')
import sys
from twisted.internet import stdio, protocol
Modified: branches/cov-subprocess-8266/twisted/test/test_stdio.py
==============================================================================
--- branches/cov-subprocess-8266/twisted/test/test_stdio.py (original)
+++ branches/cov-subprocess-8266/twisted/test/test_stdio.py Sat Apr 16 23:46:58 2016
@@ -23,7 +23,7 @@
# A short string which is intended to appear here and nowhere else,
# particularly not in any random garbage output CPython unavoidable
# generates (such as in warning text and so forth). This is searched
-# for in the output from stdio_test_lastwrite.py and if it is found at
+# for in the output from stdio_test_lastwrite and if it is found at
# the end, the functionality works.
UNIQUE_LAST_WRITE_STRING = b'xyz123abc Twisted is great!'
@@ -104,13 +104,8 @@
"""
import twisted
subenv = dict(os.environ)
- subenv['PYTHONPATH'] = os.pathsep.join(
- [os.path.abspath(
- os.path.dirname(os.path.dirname(twisted.__file__))),
- subenv.get('PYTHONPATH', '')
- ])
args = [sys.executable,
- filepath.FilePath(__file__).sibling(sibling).asBytesMode().path,
+ b"-m", b"twisted.test." + sibling,
reactor.__class__.__module__] + list(args)
return reactor.spawnProcess(
proto,
@@ -137,7 +132,7 @@
log.msg("Child process logging to " + errorLogFile)
p = StandardIOTestProcessProtocol()
d = p.onCompletion
- self._spawnProcess(p, 'stdio_test_loseconn.py', errorLogFile)
+ self._spawnProcess(p, b'stdio_test_loseconn', errorLogFile)
def processEnded(reason):
# Copy the child's log to ours so it's more visible.
@@ -172,7 +167,7 @@
d = self._requireFailure(p.onDataReceived, processEnded)
self._spawnProcess(
- p, 'stdio_test_halfclose.py', errorLogFile)
+ p, b'stdio_test_halfclose', errorLogFile)
return d
@@ -196,7 +191,7 @@
try:
self._spawnProcess(
- p, 'stdio_test_lastwrite.py', UNIQUE_LAST_WRITE_STRING,
+ p, b'stdio_test_lastwrite', UNIQUE_LAST_WRITE_STRING,
usePTY=True)
except ValueError as e:
# Some platforms don't work with usePTY=True
@@ -222,7 +217,7 @@
"""
p = StandardIOTestProcessProtocol()
d = p.onCompletion
- self._spawnProcess(p, 'stdio_test_hostpeer.py')
+ self._spawnProcess(p, b'stdio_test_hostpeer')
def processEnded(reason):
host, peer = p.data[1].splitlines()
@@ -240,7 +235,7 @@
p = StandardIOTestProcessProtocol()
d = p.onCompletion
- self._spawnProcess(p, 'stdio_test_write.py')
+ self._spawnProcess(p, b'stdio_test_write')
def processEnded(reason):
self.assertEqual(p.data[1], b'ok!')
@@ -256,7 +251,7 @@
p = StandardIOTestProcessProtocol()
d = p.onCompletion
- self._spawnProcess(p, 'stdio_test_writeseq.py')
+ self._spawnProcess(p, b'stdio_test_writeseq')
def processEnded(reason):
self.assertEqual(p.data[1], b'ok!')
@@ -289,7 +284,7 @@
proc.write(written[-1])
reactor.callLater(0.01, connectionMade, None)
- proc = self._spawnProcess(p, 'stdio_test_producer.py')
+ proc = self._spawnProcess(p, b'stdio_test_producer')
p.onConnection.addCallback(connectionMade)
@@ -312,7 +307,7 @@
junkPath = self._junkPath()
- self._spawnProcess(p, 'stdio_test_consumer.py', junkPath)
+ self._spawnProcess(p, b'stdio_test_consumer', junkPath)
def processEnded(reason):
with open(junkPath, 'rb') as f: