Merge "Merge very similar code in test_volume_readonly_update"