From 0e90567f37e961d11131dce96b4448fc0bfb2cdc Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Tue, 28 Jun 2016 09:53:25 -0400
Subject: [PATCH] Remove the --pdb option, because it was just a passthrough to
 nose

---
 pavelib/acceptance_test.py                    | 1 -
 pavelib/bok_choy.py                           | 1 -
 pavelib/tests.py                              | 4 ----
 pavelib/utils/test/suites/acceptance_suite.py | 1 -
 pavelib/utils/test/suites/bokchoy_suite.py    | 2 --
 pavelib/utils/test/suites/nose_suite.py       | 3 ---
 6 files changed, 12 deletions(-)

diff --git a/pavelib/acceptance_test.py b/pavelib/acceptance_test.py
index e5fc5480532..271c1e6c892 100644
--- a/pavelib/acceptance_test.py
+++ b/pavelib/acceptance_test.py
@@ -25,7 +25,6 @@ __test__ = False  # do not collect
     make_option("--verbose", action="store_const", const=2, dest="verbosity"),
     make_option("-q", "--quiet", action="store_const", const=0, dest="verbosity"),
     make_option("-v", "--verbosity", action="count", dest="verbosity"),
-    make_option("--pdb", action="store_true", help="Launches an interactive debugger upon error"),
     ("default_store=", None, "deprecated in favor of default-store"),
     ('extra_args=', 'e', 'deprecated, pass extra options directly in the paver commandline'),
 ])
diff --git a/pavelib/bok_choy.py b/pavelib/bok_choy.py
index 7d663f9e7a0..a8d5048e8f4 100644
--- a/pavelib/bok_choy.py
+++ b/pavelib/bok_choy.py
@@ -31,7 +31,6 @@ BOKCHOY_OPTS = [
     make_option("--verbose", action="store_const", const=2, dest="verbosity"),
     make_option("-q", "--quiet", action="store_const", const=0, dest="verbosity"),
     make_option("-v", "--verbosity", action="count", dest="verbosity"),
-    make_option("--pdb", action="store_true", help="Drop into debugger on failures or errors"),
     make_option("--skip-firefox-version-validation", action='store_false', dest="validate_firefox_version"),
     make_option("--save-screenshots", action='store_true', dest="save_screenshots"),
     ('default_store=', None, 'deprecated in favor of default-store'),
diff --git a/pavelib/tests.py b/pavelib/tests.py
index 58b6e9154d0..c56f247dce6 100644
--- a/pavelib/tests.py
+++ b/pavelib/tests.py
@@ -39,7 +39,6 @@ __test__ = False  # do not collect
     make_option("--verbose", action="store_const", const=2, dest="verbosity"),
     make_option("-q", "--quiet", action="store_const", const=0, dest="verbosity"),
     make_option("-v", "--verbosity", action="count", dest="verbosity", default=1),
-    make_option("--pdb", action="store_true", help="Drop into debugger on failures or errors"),
     make_option(
         '--disable-migrations',
         action='store_true',
@@ -111,7 +110,6 @@ def test_system(options, passthrough_options):
     make_option("--verbose", action="store_const", const=2, dest="verbosity"),
     make_option("-q", "--quiet", action="store_const", const=0, dest="verbosity"),
     make_option("-v", "--verbosity", action="count", dest="verbosity", default=1),
-    make_option("--pdb", action="store_true", help="Drop into debugger on failures or errors"),
     ('cov_args=', None, 'deprecated in favor of cov-args'),
     make_option(
         '-e', '--extra_args', default='',
@@ -172,7 +170,6 @@ def test_lib(options, passthrough_options):
     make_option("--verbose", action="store_const", const=2, dest="verbosity"),
     make_option("-q", "--quiet", action="store_const", const=0, dest="verbosity"),
     make_option("-v", "--verbosity", action="count", dest="verbosity", default=1),
-    make_option("--pdb", action="store_true", help="Drop into debugger on failures or errors"),
     make_option(
         '--disable-migrations',
         action='store_true',
@@ -212,7 +209,6 @@ def test_python(options, passthrough_options):
     make_option("--verbose", action="store_const", const=2, dest="verbosity"),
     make_option("-q", "--quiet", action="store_const", const=0, dest="verbosity"),
     make_option("-v", "--verbosity", action="count", dest="verbosity", default=1),
-    make_option("--pdb", action="store_true", help="Drop into debugger on failures or errors"),
     ('cov_args=', None, 'deprecated in favor of cov-args'),
     make_option(
         '-e', '--extra_args', default='',
diff --git a/pavelib/utils/test/suites/acceptance_suite.py b/pavelib/utils/test/suites/acceptance_suite.py
index d87d7b68986..e21f6088bd7 100644
--- a/pavelib/utils/test/suites/acceptance_suite.py
+++ b/pavelib/utils/test/suites/acceptance_suite.py
@@ -44,7 +44,6 @@ class AcceptanceTest(TestSuite):
             "--traceback",
             "--debug-mode",
             "--verbosity={}".format(self.verbosity),
-            "--pdb" if self.pdb else "",
         ] + report_args + [
             self.extra_args
         ] + self.passthrough_options
diff --git a/pavelib/utils/test/suites/bokchoy_suite.py b/pavelib/utils/test/suites/bokchoy_suite.py
index bda6098ace7..4929b589ea7 100644
--- a/pavelib/utils/test/suites/bokchoy_suite.py
+++ b/pavelib/utils/test/suites/bokchoy_suite.py
@@ -250,8 +250,6 @@ class BokChoyTestSuite(TestSuite):
             "nosetests",
             test_spec,
         ] + self.verbosity_processes_command
-        if self.pdb:
-            cmd.append("--pdb")
         if self.save_screenshots:
             cmd.append("--with-save-baseline")
         if self.extra_args:
diff --git a/pavelib/utils/test/suites/nose_suite.py b/pavelib/utils/test/suites/nose_suite.py
index cef5fcfa11f..3a1cc4e892c 100644
--- a/pavelib/utils/test/suites/nose_suite.py
+++ b/pavelib/utils/test/suites/nose_suite.py
@@ -102,9 +102,6 @@ class NoseTestSuite(TestSuite):
         if self.fail_fast or env_fail_fast_set:
             opts.append("--stop")
 
-        if self.pdb:
-            opts += " --pdb"
-
         if self.use_ids:
             opts.append("--with-id")
 
-- 
GitLab