summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2014-05-29 19:27:05 +0200
committerFlorent Xicluna <florent.xicluna@gmail.com>2014-05-29 19:27:05 +0200
commit3fbadb7007436c029a3ede4c057ce43171dcd617 (patch)
tree470427306dea2f04fdb228f66d25d9bb50fe0fae /testsuite
parent46a2d180b43c152c3fbad91487a77c69a86bcf4d (diff)
parent8a37cd90fdc731d151628b541d3edfd056f67e7c (diff)
downloadpep8-3fbadb7007436c029a3ede4c057ce43171dcd617.tar.gz
Replace codes E111/2/3 with E114/5/6 for indentation of comments; issue #274
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/E11.py22
-rw-r--r--testsuite/test_api.py4
-rw-r--r--testsuite/test_shell.py2
3 files changed, 24 insertions, 4 deletions
diff --git a/testsuite/E11.py b/testsuite/E11.py
index 98b9431..4ed1096 100644
--- a/testsuite/E11.py
+++ b/testsuite/E11.py
@@ -10,7 +10,27 @@ print
#: E113
print
print
-#: E111 E113
+#: E114 E116
mimetype = 'application/x-directory'
# 'httpd/unix-directory'
create_date = False
+#: E116 E116 E116
+def start(self):
+ if True:
+ self.master.start()
+ # try:
+ # self.master.start()
+ # except MasterExit:
+ # self.shutdown()
+ # finally:
+ # sys.exit()
+#: E115 E115 E115 E115 E115 E115
+def start(self):
+ if True:
+# try:
+# self.master.start()
+# except MasterExit:
+# self.shutdown()
+# finally:
+# sys.exit()
+ self.master.start()
diff --git a/testsuite/test_api.py b/testsuite/test_api.py
index fba27c7..980fe9e 100644
--- a/testsuite/test_api.py
+++ b/testsuite/test_api.py
@@ -124,7 +124,7 @@ class APITestCase(unittest.TestCase):
report = pep8.StyleGuide().check_files([E11])
stdout = sys.stdout.getvalue().splitlines()
self.assertEqual(len(stdout), report.total_errors)
- self.assertEqual(report.total_errors, 6)
+ self.assertEqual(report.total_errors, 17)
self.assertFalse(sys.stderr)
self.reset()
@@ -132,7 +132,7 @@ class APITestCase(unittest.TestCase):
report = pep8.StyleGuide(paths=[E11]).check_files()
stdout = sys.stdout.getvalue().splitlines()
self.assertEqual(len(stdout), report.total_errors)
- self.assertEqual(report.total_errors, 6)
+ self.assertEqual(report.total_errors, 17)
self.assertFalse(sys.stderr)
self.reset()
diff --git a/testsuite/test_shell.py b/testsuite/test_shell.py
index e1205cc..e536852 100644
--- a/testsuite/test_shell.py
+++ b/testsuite/test_shell.py
@@ -75,7 +75,7 @@ class ShellTestCase(unittest.TestCase):
stdout = stdout.splitlines()
self.assertEqual(errcode, 1)
self.assertFalse(stderr)
- self.assertEqual(len(stdout), 6)
+ self.assertEqual(len(stdout), 17)
for line, num, col in zip(stdout, (3, 6, 9, 12), (3, 6, 1, 5)):
path, x, y, msg = line.split(':')
self.assertTrue(path.endswith(E11))