From 9754a2ebe3f0ef66efd6fe0ff6c32fbb2e992617 Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Wed, 10 Jan 2018 11:35:00 +0100 Subject: [PATCH] Change exit code when displaying empty rings Displaying an empty ring should not be an error, thus changing the exit code back to the former value of 0. Closes-Bug: 1742417 Change-Id: I779c30cff1b4d24483f993221a8c6d944b7ae98d --- swift/cli/ringbuilder.py | 4 +--- test/unit/cli/test_ringbuilder.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/swift/cli/ringbuilder.py b/swift/cli/ringbuilder.py index 44187e6fd0..5056d2567e 100644 --- a/swift/cli/ringbuilder.py +++ b/swift/cli/ringbuilder.py @@ -547,9 +547,7 @@ swift-ring-builder if ring_empty_error: print(ring_empty_error) - exit(EXIT_ERROR) - else: - exit(EXIT_SUCCESS) + exit(EXIT_SUCCESS) @staticmethod def search(): diff --git a/test/unit/cli/test_ringbuilder.py b/test/unit/cli/test_ringbuilder.py index 63bedcfeae..f38761daf1 100644 --- a/test/unit/cli/test_ringbuilder.py +++ b/test/unit/cli/test_ringbuilder.py @@ -1903,7 +1903,7 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin): argv = ["", self.tmpfile, "default"] with mock.patch("sys.stdout", mock_stdout): with mock.patch("sys.stderr", mock_stderr): - self.assertSystemExit(EXIT_ERROR, ringbuilder.main, argv) + self.assertSystemExit(EXIT_SUCCESS, ringbuilder.main, argv) deleted_dev_list = ( " 0 0 0 127.0.0.1:6200 127.0.0.1:6200 " "sda1 0.00 0 0.00 DEL some meta data\n" @@ -1929,7 +1929,7 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin): argv = ["", self.tmpfile, "default"] with mock.patch("sys.stdout", mock_stdout): with mock.patch("sys.stderr", mock_stderr): - self.assertSystemExit(EXIT_ERROR, ringbuilder.main, argv) + self.assertSystemExit(EXIT_SUCCESS, ringbuilder.main, argv) output = mock_stdout.getvalue() self.assertIn("64 partitions", output)