openstack/swift
Code Issues Proposed changes

Merge "Change exit code when displaying empty rings"

Browse Source
This commit is contained in:
Zuul
2018-01-11 12:16:56 +00:00
committed by Gerrit Code Review
parent b7cc19d9c5 9754a2ebe3
commit 5917ea0ea1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/cli/ringbuilder.py
View File

@@ -547,8 +547,6 @@ swift-ring-builder <builder_file>
if ring_empty_error: if ring_empty_error:
print(ring_empty_error) print(ring_empty_error)
exit(EXIT_ERROR)
else:
exit(EXIT_SUCCESS) exit(EXIT_SUCCESS)
@staticmethod @staticmethod

4
test/unit/cli/test_ringbuilder.py
View File

@@ -1903,7 +1903,7 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin):
argv = ["", self.tmpfile, "default"] argv = ["", self.tmpfile, "default"]
with mock.patch("sys.stdout", mock_stdout): with mock.patch("sys.stdout", mock_stdout):
with mock.patch("sys.stderr", mock_stderr): with mock.patch("sys.stderr", mock_stderr):
self.assertSystemExit(EXIT_ERROR, ringbuilder.main, argv) self.assertSystemExit(EXIT_SUCCESS, ringbuilder.main, argv)
deleted_dev_list = ( deleted_dev_list = (
" 0 0 0 127.0.0.1:6200 127.0.0.1:6200 " " 0 0 0 127.0.0.1:6200 127.0.0.1:6200 "
"sda1 0.00 0 0.00 DEL some meta data\n" "sda1 0.00 0 0.00 DEL some meta data\n"
@@ -1929,7 +1929,7 @@ class TestCommands(unittest.TestCase, RunSwiftRingBuilderMixin):
argv = ["", self.tmpfile, "default"] argv = ["", self.tmpfile, "default"]
with mock.patch("sys.stdout", mock_stdout): with mock.patch("sys.stdout", mock_stdout):
with mock.patch("sys.stderr", mock_stderr): 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() output = mock_stdout.getvalue()
self.assertIn("64 partitions", output) self.assertIn("64 partitions", output)