Merge "Fix ringbuilder tests"

2016-03-21 09:33:58 +00:00 · 2016-03-21 09:33:58 +00:00 · 9282a9bae4
commit 9282a9bae4
parent b685e85135 6d8be59fce
2 changed files with 191 additions and 331 deletions
--- a/swift/cli/ringbuilder.py
+++ b/swift/cli/ringbuilder.py
@ -1183,7 +1183,7 @@ swift-ring-builder <builder_file> set_overload <overload>[%]

 def main(arguments=None):
    global argv, backup_dir, builder, builder_file, ring_file
-    if arguments:
+    if arguments is not None:
        argv = arguments
    else:
        argv = sys_argv
--- a/test/unit/cli/test_ringbuilder.py
+++ b/test/unit/cli/test_ringbuilder.py