diff --git a/tests/integration/files/conf/minion b/tests/integration/files/conf/minion index e9a607c348..b6e5c62f62 100644 --- a/tests/integration/files/conf/minion +++ b/tests/integration/files/conf/minion @@ -5,7 +5,7 @@ root_dir: /tmp/salttest pki_dir: pki id: minion cachedir: cachedir -acceptance_wait_time: = 1 +#acceptance_wait_time: = 1 open_mode: True log_file: minion diff --git a/tests/integration/shell/key.py b/tests/integration/shell/key.py index 864c6ba164..d0f8a83e5b 100644 --- a/tests/integration/shell/key.py +++ b/tests/integration/shell/key.py @@ -20,6 +20,7 @@ class KeyTest(integration.ShellCase): '\x1b[1;31mUnaccepted Keys:\x1b[0m', '\x1b[1;32mAccepted Keys:\x1b[0m', '\x1b[0;32mminion\x1b[0m', + '\x1b[0;32msub_minion\x1b[0m', '\x1b[1;34mRejected:\x1b[0m', ''] self.assertEqual(data, expect)