summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/backtest.py2
-rw-r--r--test/coveragetest.py10
-rw-r--r--test/farm/annotate/run_multi.py2
-rw-r--r--test/farm/html/run_tabbed.py2
-rw-r--r--test/farm/html/src/b.py2
-rw-r--r--test/farm/html/src/tabbed.py2
-rw-r--r--test/stress_phystoken.txt1
7 files changed, 11 insertions, 10 deletions
diff --git a/test/backtest.py b/test/backtest.py
index 63ee5194..4460a78d 100644
--- a/test/backtest.py
+++ b/test/backtest.py
@@ -4,7 +4,7 @@
# (Redefining built-in blah)
# The whole point of this file is to redefine built-ins, so shut up about it.
-import os, sys
+import os
# Py2k and 3k don't agree on how to run commands in a subprocess.
try:
diff --git a/test/coveragetest.py b/test/coveragetest.py
index fb6a5bcc..603c685c 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -38,7 +38,7 @@ class CoverageTest(TestCase):
self.old_dir = os.getcwd()
os.chdir(self.temp_dir)
-
+
# Modules should be importable from this temp directory.
self.old_syspath = sys.path[:]
sys.path.insert(0, '')
@@ -48,7 +48,7 @@ class CoverageTest(TestCase):
# Record environment variables that we changed with set_environ.
self.environ_undos = {}
-
+
# Use a Tee to capture stdout.
self.old_stdout = sys.stdout
self.captured_stdout = StringIO()
@@ -71,15 +71,15 @@ class CoverageTest(TestCase):
def set_environ(self, name, value):
"""Set an environment variable `name` to be `value`.
-
+
The environment variable is set, and record is kept that it was set,
so that `tearDown` can restore its original value.
-
+
"""
if name not in self.environ_undos:
self.environ_undos[name] = os.environ.get(name)
os.environ[name] = value
-
+
def original_environ(self, name):
"""The environment variable `name` from when the test started."""
if name in self.environ_undos:
diff --git a/test/farm/annotate/run_multi.py b/test/farm/annotate/run_multi.py
index 872f0976..4e8252ed 100644
--- a/test/farm/annotate/run_multi.py
+++ b/test/farm/annotate/run_multi.py
@@ -1,7 +1,7 @@
copy("src", "out_multi")
run("""
coverage -e -x multi.py
- coverage -a
+ coverage -a
""", rundir="out_multi")
compare("out_multi", "gold_multi", "*,cover")
clean("out_multi")
diff --git a/test/farm/html/run_tabbed.py b/test/farm/html/run_tabbed.py
index f28e0c37..3076b4e5 100644
--- a/test/farm/html/run_tabbed.py
+++ b/test/farm/html/run_tabbed.py
@@ -17,7 +17,7 @@ contains("html_tabbed/tabbed.html",
"<span class='nam'>x</span><span class='op'>:</span>"
"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; "
"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; "
- "<span class='com'># look nice</span>"
+ "<span class='com'># look nice</span>"
)
doesnt_contain("html_tabbed/tabbed.html", "\t")
diff --git a/test/farm/html/src/b.py b/test/farm/html/src/b.py
index f5d051c6..dffdd50f 100644
--- a/test/farm/html/src/b.py
+++ b/test/farm/html/src/b.py
@@ -13,7 +13,7 @@ def two(x):
# A missed else that branches to "exit"
if x:
a = 5
-
+
two(1)
def three_way():
diff --git a/test/farm/html/src/tabbed.py b/test/farm/html/src/tabbed.py
index bc6bb456..4c39cafe 100644
--- a/test/farm/html/src/tabbed.py
+++ b/test/farm/html/src/tabbed.py
@@ -3,6 +3,6 @@ x = 1
if x:
a = "Tabbed" # Aligned comments
if x: # look nice
- b = "No spaces" # when they
+ b = "No spaces" # when they
c = "Done" # line up.
diff --git a/test/stress_phystoken.txt b/test/stress_phystoken.txt
index 7e2f2858..1206c4ac 100644
--- a/test/stress_phystoken.txt
+++ b/test/stress_phystoken.txt
@@ -15,6 +15,7 @@ lots_of_back = """\
hey \
there
"""
+# This next line is supposed to have trailing whitespace:
fake_back = """\
ouch
"""