Change --dependencies flag to --labels flag to be more consistent.  Also
let people add their own dependencies even if they specified a test
via --test.

Risk: Low
Visibility: High

Signed-off-by: Jeremy Orlow <jorlow@google.com>



git-svn-id: http://test.kernel.org/svn/autotest/trunk@2356 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/cli/cli_mock.py b/cli/cli_mock.py
index 4260bff..59d15b5 100755
--- a/cli/cli_mock.py
+++ b/cli/cli_mock.py
@@ -10,6 +10,7 @@
 from autotest_lib.frontend.afe.json_rpc import proxy
 from autotest_lib.client.common_lib.test_utils import mock
 
+CLI_USING_PDB = False
 CLI_UT_DEBUG = False
 
 def create_file(content):
@@ -96,7 +97,7 @@
 
         self.mock_rpcs(rpcs)
 
-        if not CLI_UT_DEBUG:
+        if not (CLI_USING_PDB and CLI_UT_DEBUG):
             self.god.mock_io()
         if exit_code != None:
             sys.exit.expect_call(exit_code).and_raises(ExitException)