summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-16 12:50:16 +0000
committerGerrit Code Review <review@openstack.org>2016-11-16 12:50:16 +0000
commit781d7d9e3be5077e3af361f87b089ea99329cd18 (patch)
tree269fdd4cee562eeaf05f8cbea8adafd51f610086
parente2a4151df0f382d12ce025b00a0152e64318ec36 (diff)
parentf8b962b9c83499d9619a67d5092f35f1283cfb00 (diff)
Merge "Correct the order of parameters in assertEqual()"
-rw-r--r--manila/tests/data/test_utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/manila/tests/data/test_utils.py b/manila/tests/data/test_utils.py
index 27e7645..8fea9cc 100644
--- a/manila/tests/data/test_utils.py
+++ b/manila/tests/data/test_utils.py
@@ -116,7 +116,7 @@ class CopyClassTestCase(test.TestCase):
116 self._copy.cancel() 116 self._copy.cancel()
117 117
118 # asserts 118 # asserts
119 self.assertEqual(self._copy.cancelled, True) 119 self.assertTrue(self._copy.cancelled)
120 120
121 # reset 121 # reset
122 self._copy.cancelled = False 122 self._copy.cancelled = False
@@ -139,7 +139,7 @@ class CopyClassTestCase(test.TestCase):
139 self._copy.get_total_size(self._copy.src) 139 self._copy.get_total_size(self._copy.src)
140 140
141 # asserts 141 # asserts
142 self.assertEqual(self._copy.total_size, 10000) 142 self.assertEqual(10000, self._copy.total_size)
143 143
144 utils.execute.assert_has_calls([ 144 utils.execute.assert_has_calls([
145 mock.call("ls", "-pA1", "--group-directories-first", 145 mock.call("ls", "-pA1", "--group-directories-first",
@@ -159,7 +159,7 @@ class CopyClassTestCase(test.TestCase):
159 self._copy.get_total_size(self._copy.src) 159 self._copy.get_total_size(self._copy.src)
160 160
161 # asserts 161 # asserts
162 self.assertEqual(self._copy.total_size, 0) 162 self.assertEqual(0, self._copy.total_size)
163 163
164 # reset 164 # reset
165 self._copy.total_size = 10000 165 self._copy.total_size = 10000
@@ -180,7 +180,7 @@ class CopyClassTestCase(test.TestCase):
180 self._copy.get_total_size(self._copy.src) 180 self._copy.get_total_size(self._copy.src)
181 181
182 # asserts 182 # asserts
183 self.assertEqual(self._copy.total_size, 0) 183 self.assertEqual(0, self._copy.total_size)
184 utils.execute.assert_called_once_with( 184 utils.execute.assert_called_once_with(
185 "ls", "-pA1", "--group-directories-first", self._copy.src, 185 "ls", "-pA1", "--group-directories-first", self._copy.src,
186 run_as_root=True) 186 run_as_root=True)