remove the --inbound flag

.gitignore

@@ -3,3 +3,5 @@ dist/*
 *.pyc
 *.swp
 .DS_Store
+build/*
+coveragerc

mozregression/bisector.py

@@ -422,7 +422,7 @@ class BisectRunner(object):
         if isinstance(handler, NightlyHandler):
             info = '--good=%s --bad=%s' % (handler.good_date, handler.bad_date)
         else:
-            info = ('--inbound --good-rev=%s --bad-rev=%s'
+            info = ('--good-rev=%s --bad-rev=%s'
                     % (handler.good_revision, handler.bad_revision))
         options = self.options
         info += ' --app=%s' % options.app

mozregression/main.py

@@ -64,7 +64,7 @@ def parse_args(argv=None):
              " [[--good GOOD_DATE]|[--good-release GOOD_RELEASE]]"
              "\n"
              " %(prog)s [OPTIONS]"
-             " --inbound --bad-rev BAD_REV --good-rev GOOD_REV")
+             " --bad-rev BAD_REV --good-rev GOOD_REV")
 
     defaults = get_defaults(DEFAULT_CONF_FNAME)
     parser = ArgumentParser(usage=usage)
@@ -97,18 +97,13 @@ def parse_args(argv=None):
                         help=("last known good nightly build. This option is"
                               " incompatible with --good."))
 
-    parser.add_argument("--inbound",
-                        action="store_true",
-                        help=("use inbound instead of nightlies (use"
-                              " --good-rev and --bad-rev options."))
-
     parser.add_argument("--bad-rev", dest="first_bad_revision",
-                        help=("first known bad revision (use with"
-                              " --inbound)."))
+                        help=("first known bad revision (for inbound"
+                              " bisection)."))
 
     parser.add_argument("--good-rev", dest="last_good_revision",
-                        help=("last known good revision (use with"
-                              " --inbound)."))
+                        help=("last known good revision (for inbound"
+                              " bisection)."))
 
     parser.add_argument("--find-fix", action="store_true",
                         help="Search for a bug fix instead of a regression.")
@@ -333,10 +328,12 @@ def cli(argv=None):
         # can go to inbound from nightly.
         fetch_config.set_inbound_branch(options.inbound_branch)
 
-    if options.inbound:
+    # bisect inbound if last good revision or first bad revision are set
+    if options.first_bad_revision or options.last_good_revision:
         bisect = bisect_inbound
     else:
         bisect = bisect_nightlies
+
     try:
         launcher_class = APP_REGISTRY.get(fetch_config.app_name)
         launcher_class.check_is_runnable()

tests/unit/test_bisector.py

@@ -414,7 +414,6 @@ class TestBisectRunner(unittest.TestCase):
         self.assertIn('--bits=64', result)
         self.assertIn('--good=2015-01-01', result)
         self.assertIn('--bad=2015-01-11', result)
-        self.assertNotIn('--inbound', result)
 
         self.assertNotIn('--find-fix', result)
         result = self.print_resume_info(NightlyHandler, find_fix=True)
@@ -450,7 +449,6 @@ class TestBisectRunner(unittest.TestCase):
         self.assertIn('--app=b2g', result)
         self.assertIn('--good-rev=123', result)
         self.assertIn('--bad-rev=456', result)
-        self.assertIn('--inbound', result)
 
 
 if __name__ == '__main__':

tests/unit/test_main.py

@@ -99,7 +99,7 @@ class TestMainCli(unittest.TestCase):
 
     def test_basic_inbound(self):
         self.runner.bisect_inbound.return_value = 0
-        exitcode = self.do_cli(['--inbound', '--good-rev=1', '--bad-rev=5'])
+        exitcode = self.do_cli(['--good-rev=1', '--bad-rev=5'])
         # application is by default firefox
         self.assertEqual(self.runner.fetch_config.app_name, 'firefox')
         # bisect_inbound has been called
@@ -109,9 +109,7 @@ class TestMainCli(unittest.TestCase):
 
     def test_inbound_revs_must_be_given(self):
         argslist = [
-            ['--inbound'],
-            ['--inbound', '--good-rev=1'],
-            ['--inbound', '--bad-rev=5'],
+            ['--good-rev=1'], ['--bad-rev=5'],
         ]
         for args in argslist:
             exitcode = self.do_cli(args)
@@ -120,7 +118,7 @@ class TestMainCli(unittest.TestCase):
     @patch('mozregression.fetch_configs.FirefoxConfig.is_inbound')
     def test_inbound_must_be_doable(self, is_inbound):
         is_inbound.return_value = False
-        exitcode = self.do_cli(['--inbound', '--good-rev=1', '--bad-rev=5'])
+        exitcode = self.do_cli(['--good-rev=1', '--bad-rev=5'])
         self.assertIn('Unable to bissect inbound', exitcode)
 
     @patch('mozregression.main.formatted_valid_release_dates')