From 42e9dffd24fec0152dd203e07b4cb593adef741e Mon Sep 17 00:00:00 2001 From: dachshund Date: Sun, 23 Jun 2013 13:08:26 +0800 Subject: [PATCH] Patch mock signercli.make_delegation prompts. --- tuf/tests/repository_setup.py | 4 +++- .../system_tests/test_extraneous_dependencies_attack.py | 4 +++- tuf/tests/system_tests/util_test_tools.py | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tuf/tests/repository_setup.py b/tuf/tests/repository_setup.py index 3b2d20f5..969d97d0 100755 --- a/tuf/tests/repository_setup.py +++ b/tuf/tests/repository_setup.py @@ -141,8 +141,10 @@ def _mock_prompt(msg, junk): return delegated_targets_dir elif msg.startswith('\nChoose and enter the parent'): return parent_role - elif msg.endswith('\nEnter the delegated role\'s name: '): + elif msg.startswith('\nEnter the delegated role\'s name: '): return delegated_role_name + elif msg.startswith('Recursively walk the given directory? (Y)es/(N)o: '): + return 'N' else: error_msg = ('Prompt: '+'\''+msg+'\''+ ' did not match any predefined mock prompts.') diff --git a/tuf/tests/system_tests/test_extraneous_dependencies_attack.py b/tuf/tests/system_tests/test_extraneous_dependencies_attack.py index 57f1c583..597e585b 100755 --- a/tuf/tests/system_tests/test_extraneous_dependencies_attack.py +++ b/tuf/tests/system_tests/test_extraneous_dependencies_attack.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + """ test_extraneous_dependencies_attack.py @@ -179,4 +181,4 @@ def _write_rogue_metadata(): try: test_extraneous_dependencies_attack() except ExtraneousDependenciesAttackAlert, error: - print 'error' \ No newline at end of file + print 'error' diff --git a/tuf/tests/system_tests/util_test_tools.py b/tuf/tests/system_tests/util_test_tools.py index 7588e61f..6267a6ee 100755 --- a/tuf/tests/system_tests/util_test_tools.py +++ b/tuf/tests/system_tests/util_test_tools.py @@ -549,8 +549,10 @@ def _mock_prompt(msg, junk, targets_path=delegated_targets_path, return targets_path elif msg.startswith('\nChoose and enter the parent'): return parent_role - elif msg.endswith('\nEnter the delegated role\'s name: '): + elif msg.startswith('\nEnter the delegated role\'s name: '): return new_role_name + elif msg.startswith('Recursively walk the given directory? (Y)es/(N)o: '): + return 'N' else: error_msg = ('Prompt: '+'\''+msg+'\''+ ' did not match any predefined mock prompts.') @@ -585,4 +587,4 @@ def _mock_get_keyid(junk, keyid=keyid): signercli._get_keyids = original_get_keyids signercli._get_password = original_get_password signercli._prompt = original_prompt - signercli._get_metadata_directory = original_get_metadata_directory \ No newline at end of file + signercli._get_metadata_directory = original_get_metadata_directory