Removed underscores from the end of some variables

Change-Id: Iff664cef5ec580de6a33db1503a6e567701418a3
This commit is contained in:
Andrey Shestakov
2013-10-15 00:21:44 +03:00
parent 2b80a03fa2
commit 6a2592ac48
3 changed files with 18 additions and 18 deletions

View File

@@ -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):

View File

@@ -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):

View File

@@ -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):