RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-21 02:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa: fix output check to not be sensitive to debugging

Browse Source 
The traceback would screw up the equality checks.

Also, use unittest asserts so we can easily see the assert values.

Fixes: https://tracker.ceph.com/issues/43247
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2019-12-10 15:08:41 -08:00
parent 79f7e6aeef
commit 0448a31fcb
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qa/tasks/cephfs/test_cephfs_shell.py
View File

@ -334,43 +334,40 @@ class TestSnapshots(TestCephFSShell):
# create the snapshot - must pass
o = self.get_cephfs_shell_cmd_output("snap create snap1 /data_dir")
log.info("cephfs-shell output:\n{}".format(o))
assert(o == "")
self.assertEqual("", o)
o = self.mount_a.stat(sdn)
log.info("mount_a output:\n{}".format(o))
assert(('st_mode' in str(o)) == True)
self.assertIn('st_mode', o)
# create the same snapshot again - must fail with an error message
o = self.get_cephfs_shell_cmd_error("snap create snap1 /data_dir")
log.info("cephfs-shell output:\n{}".format(o))
o = o.split('\n')
assert(o[0] == "ERROR: snapshot 'snap1' already exists")
self.assertIn("snapshot 'snap1' already exists", o)
o = self.mount_a.stat(sdn)
log.info("mount_a output:\n{}".format(o))
assert(('st_mode' in str(o)) == True)
self.assertIn('st_mode', o)
# delete the snapshot - must pass
o = self.get_cephfs_shell_cmd_output("snap delete snap1 /data_dir")
log.info("cephfs-shell output:\n{}".format(o))
assert(o == "")
self.assertEqual("", o)
try:
o = self.mount_a.stat(sdn)
except:
# snap dir should not exist anymore
pass
log.info("mount_a output:\n{}".format(o))
assert(('st_mode' in str(o)) == False)
self.assertNotIn('st_mode', o)
# delete the same snapshot again - must fail with an error message
o = self.get_cephfs_shell_cmd_error("snap delete snap1 /data_dir")
o = o.strip()
o = o.split('\n')
assert(o[0] == "ERROR: 'snap1': no such snapshot")
self.assertIn("'snap1': no such snapshot", o)
try:
o = self.mount_a.stat(sdn)
except:
pass
log.info("mount_a output:\n{}".format(o))
assert(('st_mode' in str(o)) == False)
self.assertNotIn('st_mode', o)
class TestCD(TestCephFSShell):
CLIENTS_REQUIRED = 1
@ -740,7 +737,6 @@ class TestMisc(TestCephFSShell):
log.info("output:\n{}".format(o))
class TestConfReading(TestCephFSShell):
def test_reading_conf_opt(self):
"""
Read conf without duplicate sections/options.