Merge "Remove superfluous variable assignment statements"

Author: Jenkins

functional/tests/compute/v2/test_server.py

@@ -87,8 +87,6 @@ def test_server_show(self):
     def wait_for(self, desired, wait=120, interval=5, failures=['ERROR']):
         # TODO(thowe): Add a server wait command to osc
         status = "notset"
-        wait = 120
-        interval = 5
         total_sleep = 0
         opts = self.get_show_opts(['status'])
         while total_sleep < wait: