Reuse UserOption when possible

ycm-core · Jan 10, 2016 · c6d2617 · c6d2617
1 parent 29a3c16
commit c6d2617
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/ycmd/tests/get_completions_test.py b/ycmd/tests/get_completions_test.py
@@ -150,21 +150,21 @@ def UltiSnipsCompleter_Works_test( self ):
 
 
   def UltiSnipsCompleter_UnusedWhenOffWithOption_test( self ):
-    self._ChangeSpecificOptions( { 'use_ultisnips_completer': False } )
-    self._app = TestApp( handlers.app )
+    with self.UserOption( 'use_ultisnips_completer', False ):
+      self._app = TestApp( handlers.app )
 
-    event_data = self._BuildRequest(
-      event_name = 'BufferVisit',
-      ultisnips_snippets = [
-          {'trigger': 'foo', 'description': 'bar'},
-          {'trigger': 'zoo', 'description': 'goo'},
-      ] )
+      event_data = self._BuildRequest(
+        event_name = 'BufferVisit',
+        ultisnips_snippets = [
+            {'trigger': 'foo', 'description': 'bar'},
+            {'trigger': 'zoo', 'description': 'goo'},
+        ] )
 
-    self._app.post_json( '/event_notification', event_data )
+      self._app.post_json( '/event_notification', event_data )
 
-    completion_data = self._BuildRequest( contents = 'oo ',
-                                          column_num = 3 )
+      completion_data = self._BuildRequest( contents = 'oo ',
+                                            column_num = 3 )
 
-    eq_( [],
-         self._app.post_json( '/completions',
-                              completion_data ).json[ 'completions' ] )
+      eq_( [],
+          self._app.post_json( '/completions',
+                                completion_data ).json[ 'completions' ] )
diff --git a/ycmd/tests/handlers_test.py b/ycmd/tests/handlers_test.py
@@ -89,13 +89,6 @@ def _CompletionLocationMatcher( location_type, value ):
                                  has_entry( location_type, value ) ) )
 
 
-  @staticmethod
-  def _ChangeSpecificOptions( options ):
-    current_options = dict( user_options_store.GetAll() )
-    current_options.update( options )
-    handlers.UpdateUserOptions( current_options )
-
-
   @staticmethod
   def _ErrorMatcher( cls, msg = None ):
     """ Returns a hamcrest matcher for a server exception response """