[pypy-svn] pypy fast-forward: (lac, arigo)
arigo
commits-noreply at bitbucket.org
Sun Jan 16 15:44:59 CET 2011
Author: Armin Rigo <arigo at tunes.org>
Branch: fast-forward
Changeset: r40717:91edfc9d40a8
Date: 2011-01-16 15:42 +0100
http://bitbucket.org/pypy/pypy/changeset/91edfc9d40a8/
Log: (lac, arigo)
Fix this test.
diff --git a/pypy/translator/goal/test2/test_app_main.py b/pypy/translator/goal/test2/test_app_main.py
--- a/pypy/translator/goal/test2/test_app_main.py
+++ b/pypy/translator/goal/test2/test_app_main.py
@@ -129,6 +129,36 @@
self.check(['-W', 'ab', '-SWc'], sys_argv=[''], warnoptions=['ab', 'c'],
run_stdin=True, no_site=1)
+ def test_sysflags(self):
+ flags = (
+ ("debug", "-d", "1"),
+ ("py3k_warning", "-3", "1"),
+ ("division_warning", "-Qwarn", "1"),
+ ("division_warning", "-Qwarnall", "2"),
+ ("division_new", "-Qnew", "1"),
+ (["inspect", "interactive"], "-i", "1"),
+ ("optimize", "-O", "1"),
+ ("optimize", "-OO", "2"),
+ ("dont_write_bytecode", "-B", "1"),
+ ("no_user_site", "-s", "1"),
+ ("no_site", "-S", "1"),
+ ("ignore_environment", "-E", "1"),
+ ("tabcheck", "-t", "1"),
+ ("tabcheck", "-tt", "2"),
+ ("verbose", "-v", "1"),
+ ("unicode", "-U", "1"),
+ ("bytes_warning", "-b", "1"),
+ )
+ for flag, opt, value in flags:
+ if isinstance(flag, list): # this is for inspect&interactive
+ expected = {}
+ for flag1 in flag:
+ expected[flag1] = int(value)
+ else:
+ expected = {flag: int(value)}
+ self.check([opt, '-c', 'pass'], sys_argv=['-c'],
+ run_command='pass', **expected)
+
class TestInteraction:
"""
@@ -479,32 +509,6 @@
assert ('>>> ' in data) == expect_prompt # no prompt unless expected
return data
- def test_sysflags(self):
- flags = (
- ("debug", "-d", "1"),
- ("py3k_warning", "-3", "1"),
- ("division_warning", "-Qwarn", "1"),
- ("division_warning", "-Qwarnall", "2"),
- ("division_new", "-Qnew", "1"),
- ("inspect", "-i", "1"),
- ("interactive", "-i", "1"),
- ("optimize", "-O", "1"),
- ("optimize", "-OO", "2"),
- ("dont_write_bytecode", "-B", "1"),
- ("no_user_site", "-s", "1"),
- ("no_site", "-S", "1"),
- ("ignore_environment", "-E", "1"),
- ("tabcheck", "-t", "1"),
- ("tabcheck", "-tt", "2"),
- ("verbose", "-v", "1"),
- ("unicode", "-U", "1"),
- ("bytes_warning", "-b", "1"),
- )
- for flag, opt, value in flags:
- cmd = "%s --print-sys-flags -c pass"
- data = self.run(cmd % (opt,), expect_prompt=opt == "-i")
- assert "%s=%s" % (flag, value) in data
-
def test_script_on_stdin(self):
for extraargs, expected_argv in [
('', ['']),
More information about the Pypy-commit
mailing list