From 6a2592ac48bb86ec6778b4d12f08bf210b6aabab Mon Sep 17 00:00:00 2001
From: Andrey Shestakov <ashestakov@mirantis.com>
Date: Tue, 15 Oct 2013 00:21:44 +0300
Subject: [PATCH] Removed underscores from the end of some variables

Change-Id: Iff664cef5ec580de6a33db1503a6e567701418a3
---
 troveclient/compat/tests/test_common.py | 14 +++++++-------
 troveclient/tests/test_common.py        | 14 +++++++-------
 troveclient/tests/test_instances.py     |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/troveclient/compat/tests/test_common.py b/troveclient/compat/tests/test_common.py
index 78dd02dc..cfa2c2ac 100644
--- a/troveclient/compat/tests/test_common.py
+++ b/troveclient/compat/tests/test_common.py
@@ -62,16 +62,16 @@ class CommonTest(TestCase):
         pass
 
     def test_limit_url(self):
-        url_ = "test-url"
-        limit_ = None
-        marker_ = None
-        self.assertEqual(url_, common.limit_url(url_))
+        url = "test-url"
+        limit = None
+        marker = None
+        self.assertEqual(url, common.limit_url(url))
 
-        limit_ = "test-limit"
-        marker_ = "test-marker"
+        limit = "test-limit"
+        marker = "test-marker"
         expected = "test-url?marker=test-marker&limit=test-limit"
         self.assertEqual(expected,
-                         common.limit_url(url_, limit=limit_, marker=marker_))
+                         common.limit_url(url, limit=limit, marker=marker))
 
 
 class CliOptionsTest(TestCase):
diff --git a/troveclient/tests/test_common.py b/troveclient/tests/test_common.py
index 95dda5e9..c0d8090f 100644
--- a/troveclient/tests/test_common.py
+++ b/troveclient/tests/test_common.py
@@ -15,16 +15,16 @@ class CommonTest(TestCase):
                               common.check_for_exceptions, resp, "body")
 
     def test_limit_url(self):
-        url_ = "test-url"
-        limit_ = None
-        marker_ = None
-        self.assertEqual(url_, common.limit_url(url_))
+        url = "test-url"
+        limit = None
+        marker = None
+        self.assertEqual(url, common.limit_url(url))
 
-        limit_ = "test-limit"
-        marker_ = "test-marker"
+        limit = "test-limit"
+        marker = "test-marker"
         expected = "test-url?marker=test-marker&limit=test-limit"
         self.assertEqual(expected,
-                         common.limit_url(url_, limit=limit_, marker=marker_))
+                         common.limit_url(url, limit=limit, marker=marker))
 
 
 class PaginatedTest(TestCase):
diff --git a/troveclient/tests/test_instances.py b/troveclient/tests/test_instances.py
index b7c04d26..b3a2a002 100644
--- a/troveclient/tests/test_instances.py
+++ b/troveclient/tests/test_instances.py
@@ -98,10 +98,10 @@ class InstancesTest(TestCase):
             return path, inst, limit, marker
 
         self.instances._list = Mock(side_effect=side_effect_func)
-        limit_ = "test-limit"
-        marker_ = "test-marker"
-        expected = ("/instances", "instances", limit_, marker_)
-        self.assertEqual(expected, self.instances.list(limit_, marker_))
+        limit = "test-limit"
+        marker = "test-marker"
+        expected = ("/instances", "instances", limit, marker)
+        self.assertEqual(expected, self.instances.list(limit, marker))
 
     def test_get(self):
         def side_effect_func(path, inst):