Merge "Add cinder_test testcase"