diff options
| author | Bartek Iwańczuk <biwanczuk@gmail.com> | 2019-04-07 00:13:06 +0200 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2019-04-07 01:13:06 +0300 |
| commit | 780e72ab6a092a6a7174c30bf4163857770d2ad0 (patch) | |
| tree | 035bf5426c6c50f3cec4790700a29563c45db8b8 /tools/permission_prompt_test.py | |
| parent | cb11bbd8396fc3f6607481d50a4c82db0bfeffb7 (diff) | |
Refactor CLI flag parsing (#2025)
Diffstat (limited to 'tools/permission_prompt_test.py')
| -rwxr-xr-x | tools/permission_prompt_test.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/tools/permission_prompt_test.py b/tools/permission_prompt_test.py index 312af2cf2..6e8922640 100755 --- a/tools/permission_prompt_test.py +++ b/tools/permission_prompt_test.py @@ -69,14 +69,14 @@ class Prompt(object): self.deno_exe = deno_exe self.test_types = test_types - def run(self, args, bytes_input): + def run(self, flags, args, bytes_input): "Returns (return_code, stdout, stderr)." - cmd = [self.deno_exe, PERMISSIONS_PROMPT_TEST_TS] + args + cmd = [self.deno_exe] + flags + [PERMISSIONS_PROMPT_TEST_TS] + args return tty_capture(cmd, bytes_input) def warm_up(self): # ignore the ts compiling message - self.run('needsWrite', b'', ["--allow-write"]) + self.run(["--allow-write"], 'needsWrite', b'') def test(self): for test_type in self.test_types: @@ -99,14 +99,14 @@ class Prompt(object): def test_allow_flag(self, test_type): code, stdout, stderr = self.run( - ["needs" + test_type.capitalize(), "--allow-" + test_type], b'') + ["--allow-" + test_type], ["needs" + test_type.capitalize()], b'') assert code == 0 assert not PROMPT_PATTERN in stderr assert not FIRST_CHECK_FAILED_PATTERN in stdout assert not PERMISSION_DENIED_PATTERN in stderr def test_yes_yes(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'y\ny\n') assert code == 0 assert PROMPT_PATTERN in stderr @@ -114,7 +114,7 @@ class Prompt(object): assert not PERMISSION_DENIED_PATTERN in stderr def test_yes_no(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'y\nn\n') assert code == 1 assert PROMPT_PATTERN in stderr @@ -122,7 +122,7 @@ class Prompt(object): assert PERMISSION_DENIED_PATTERN in stderr def test_no_no(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'n\nn\n') assert code == 1 assert PROMPT_PATTERN in stderr @@ -130,7 +130,7 @@ class Prompt(object): assert PERMISSION_DENIED_PATTERN in stderr def test_no_yes(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'n\ny\n') assert code == 0 @@ -139,7 +139,7 @@ class Prompt(object): assert not PERMISSION_DENIED_PATTERN in stderr def test_allow(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'a\n') assert code == 0 assert PROMPT_PATTERN in stderr @@ -147,7 +147,7 @@ class Prompt(object): assert not PERMISSION_DENIED_PATTERN in stderr def test_deny(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'd\n') assert code == 1 assert PROMPT_PATTERN in stderr @@ -155,7 +155,7 @@ class Prompt(object): assert PERMISSION_DENIED_PATTERN in stderr def test_unrecognized_option(self, test_type): - code, stdout, stderr = self.run(["needs" + test_type.capitalize()], + code, stdout, stderr = self.run([], ["needs" + test_type.capitalize()], b'e\na\n') assert code == 0 assert PROMPT_PATTERN in stderr @@ -165,17 +165,16 @@ class Prompt(object): def test_no_prompt(self, test_type): code, stdout, stderr = self.run( - ["needs" + test_type.capitalize(), "--no-prompt"], b'') + ["--no-prompt"], ["needs" + test_type.capitalize()], b'') assert code == 1 assert not PROMPT_PATTERN in stderr assert FIRST_CHECK_FAILED_PATTERN in stdout assert PERMISSION_DENIED_PATTERN in stderr def test_no_prompt_allow(self, test_type): - code, stdout, stderr = self.run([ - "needs" + test_type.capitalize(), "--no-prompt", - "--allow-" + test_type - ], b'') + code, stdout, stderr = self.run( + ["--no-prompt", "--allow-" + test_type], + ["needs" + test_type.capitalize()], b'') assert code == 0 assert not PROMPT_PATTERN in stderr assert not FIRST_CHECK_FAILED_PATTERN in stdout |