diff options
| author | Krishnaram Karthick Ramdoss <kramdoss@redhat.com> | 2018-05-02 11:48:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.host.prod.eng.bos.redhat.com> | 2018-05-02 11:48:59 +0000 |
| commit | 55e396a9ed1ae935bf7ca77bf1e230b5e7c4dea5 (patch) | |
| tree | cf95fc4227f234ceb24565eafe4aac1520f486ea | |
| parent | 2c9eb6ec8c283d53e332f55a60283609dd370c04 (diff) | |
| parent | 85c1682f5602503e77447b29e9af277de9c5f8fb (diff) | |
Merge "CNS: changing the validation with return code"
| -rw-r--r-- | tests/functional/common/heketi/test_volume_creation.py | 5 | ||||
| -rw-r--r-- | tests/functional/common/heketi/test_volume_expansion_and_devices.py | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/functional/common/heketi/test_volume_creation.py b/tests/functional/common/heketi/test_volume_creation.py index a2c8f73a..b6eae325 100644 --- a/tests/functional/common/heketi/test_volume_creation.py +++ b/tests/functional/common/heketi/test_volume_creation.py @@ -124,8 +124,9 @@ class TestVolumeCreationTestCases(HeketiClientSetupBaseClass): self.heketi_client_node, self.heketi_server_url, 50, raw_cli_output=True) - self.assertEqual(err.strip(), "Error: No space", - "Volume creation failed with invalid reason") + self.assertEqual(ret, 255, "Volume creation did not fail ret- %s " + "out- %s err- %s" % (ret, out, err)) + g.log.info("Volume creation failed as expected, err- %s" % err) if ret == 0: out_json = json.loads(out) diff --git a/tests/functional/common/heketi/test_volume_expansion_and_devices.py b/tests/functional/common/heketi/test_volume_expansion_and_devices.py index f27b68ac..c5c60913 100644 --- a/tests/functional/common/heketi/test_volume_expansion_and_devices.py +++ b/tests/functional/common/heketi/test_volume_expansion_and_devices.py @@ -254,7 +254,9 @@ class TestVolumeExpansionAndDevicesTestCases(HeketiClientSetupBaseClass): self.heketi_client_node, self.heketi_server_url, 620, json=True, raw_cli_output=True) - self.assertEqual("Error: No space", err.strip()) + self.assertEqual(ret, 255, "Volume creation did not fail ret- %s " + "out- %s err= %s" % (ret, out, err)) + g.log.info("Volume creation failed as expected, err- %s" % err) if ret == 0: out_json = json.loads(out) @@ -576,10 +578,9 @@ class TestVolumeExpansionAndDevicesTestCases(HeketiClientSetupBaseClass): self.heketi_client_node, self.heketi_server_url, volume_id, 50, raw_cli_output=True) - emsg = "Error: Maximum number of bricks reached." - - self.assertEqual(emsg, err.strip(), - "Expansion failed with invalid reason") + self.assertEqual(ret, 255, "volume expansion did not fail ret- %s " + "out- %s err= %s" % (ret, out, err)) + g.log.info("Volume expansion failed as expected, err- %s" % err) if ret == 0: out_json = json.loads(out) |