Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/rockstor/storageadmin/tests/test_shares.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,8 @@ def test_create(self):
"size": 100,
"replica": "non-bool",
}
e_msg7 = "Replica must be a boolean, not (<type 'unicode'>)."
# Py3.6 defaults to class 'str' in our test data.
e_msg7 = "Replica must be a boolean, not (<class 'str'>)."
response9 = self.client.post(self.BASE_URL, data=data5)
self.assertEqual(
response9.status_code,
Expand Down
9 changes: 5 additions & 4 deletions src/rockstor/storageadmin/tests/test_snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ def test_post_requests_2(self):
status.HTTP_500_INTERNAL_SERVER_ERROR,
msg=response.data,
)
e_msg = "Element 'uvisible' must be a boolean, not (<type 'unicode'>)."
# Py3.6 defaults to class 'str' in our test data.
e_msg = "Element 'uvisible' must be a boolean, not (<class 'str'>)."
self.assertEqual(response.data[0], e_msg)

# Invalid writable bool type
Expand All @@ -176,9 +177,9 @@ def test_post_requests_2(self):
status.HTTP_500_INTERNAL_SERVER_ERROR,
msg=response.data,
)
# TODO consider changing tested code to unify quota types to single
# as per "Invalid uvisible bool type" to remove need for escaping here.
e_msg = 'Element "writable" must be a boolean, not ' "(<type 'unicode'>)."
# Py3.6 defaults to class 'str' in our test data.
# Maintaining type/class report in tested code as this can help with debugging.
e_msg = 'Element "writable" must be a boolean, not ' "(<class 'str'>)."
self.assertEqual(response.data[0], e_msg)

# # Happy Path creating a snapshot by name snap3
Expand Down