message: Update test that checks auto-completion for settings set.
  This reverts r345350 and updates the test rather than removing it. Now
  we check that `--g` auto-completes to `--global`.
diff: @@ -174,6 +174,11 @@ class CommandLineCompletionTestCase(TestBase):
  """Test that 'settings set thread-f' completes to 'settings set thread-format'."""
  self.complete_from_to('settings set thread-f', 'settings set thread-format')
  + @skipIfFreeBSD # timing out on the FreeBSD buildbot
  + def test_settings_s_dash(self):
  + """Test that 'settings set --g' completes to 'settings set --global'."""
  + self.complete_from_to('settings set --g', 'settings set --global')
  +
  @skipIfFreeBSD # timing out on the FreeBSD buildbot
  def test_settings_clear_th(self):
  """Test that 'settings clear thread-f' completes to 'settings clear thread-format'."""
  