| commit | 6b1341a7f7363a96f1b6693d7785e7c113794ac6 | [log] [tgz] |
|---|---|---|
| author | koder aka kdanilov <kdanilov@mirantis.com> | Tue Apr 21 22:44:21 2015 +0300 |
| committer | koder aka kdanilov <kdanilov@mirantis.com> | Tue Apr 21 22:44:21 2015 +0300 |
| tree | f4beed3ef61a2a2dbdedc587a7cf31d82868cbbb | |
| parent | ea7eac705e7aa032835393db3cbb526787babed9 [diff] |
fix python 2.6 compatibility
diff --git a/wally/suits/io/agent.py b/wally/suits/io/agent.py index c012950..b11f20e 100644 --- a/wally/suits/io/agent.py +++ b/wally/suits/io/agent.py
@@ -361,6 +361,9 @@ # set timeout raw_out, raw_err = p.communicate(benchmark_config) + # HACK + raw_out = "{" + raw_out.split('{', 1)[1] + if 0 != p.returncode: msg = "Fio failed with code: {0}\nOutput={1}" raise OSError(msg.format(p.returncode, raw_err))
diff --git a/wally/suits/io/io_scenario_ceph.cfg b/wally/suits/io/ceph.cfg similarity index 100% rename from wally/suits/io/io_scenario_ceph.cfg rename to wally/suits/io/ceph.cfg
diff --git a/wally/suits/io/io_scenario_check_distribution.cfg b/wally/suits/io/check_distribution.cfg similarity index 100% rename from wally/suits/io/io_scenario_check_distribution.cfg rename to wally/suits/io/check_distribution.cfg
diff --git a/wally/suits/io/io_scenario_check_linearity.cfg b/wally/suits/io/check_linearity.cfg similarity index 100% rename from wally/suits/io/io_scenario_check_linearity.cfg rename to wally/suits/io/check_linearity.cfg
diff --git a/wally/suits/io/io_scenario_check_th_count.cfg b/wally/suits/io/check_th_count.cfg similarity index 100% rename from wally/suits/io/io_scenario_check_th_count.cfg rename to wally/suits/io/check_th_count.cfg
diff --git a/wally/suits/io/io_scenario_check_warmup.cfg b/wally/suits/io/check_warmup.cfg similarity index 100% rename from wally/suits/io/io_scenario_check_warmup.cfg rename to wally/suits/io/check_warmup.cfg
diff --git a/wally/suits/io/io_scenario_hdd.cfg b/wally/suits/io/hdd.cfg similarity index 100% rename from wally/suits/io/io_scenario_hdd.cfg rename to wally/suits/io/hdd.cfg
diff --git a/wally/suits/io/io_scenario_long_test.cfg b/wally/suits/io/long_test.cfg similarity index 100% rename from wally/suits/io/io_scenario_long_test.cfg rename to wally/suits/io/long_test.cfg
diff --git a/wally/suits/io/io_scenario_check_vm_count_ec2.cfg b/wally/suits/io/vm_count_ec2.cfg similarity index 100% rename from wally/suits/io/io_scenario_check_vm_count_ec2.cfg rename to wally/suits/io/vm_count_ec2.cfg