summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsxd <shang.xiaodong@zte.com.cn>2016-07-07 15:09:15 +0800
committersxd <shang.xiaodong@zte.com.cn>2016-07-07 15:09:15 +0800
commiteac8aa9137c62d3f1a8fe20ef7bde7560b6d4aca (patch)
tree7b62ad86e4054d83cfdd9b7f275514ed36cc7e7c
parentabb85f971f797e7db6c1737862b53ab4fee2a12e (diff)
fix tox error when run unittest
Currently when run "tox -epep8" it's ok, but it will be error when run "tox -epy27" or run "tox -epy34", the reason is no file .testr.conf and .converagerc in project root directory Change-Id: Ic6ab721738692c389d63bc2d84a4c2a21b397778 JIRA: PARSER-62 Signed-off-by: sxd <shang.xiaodong@zte.com.cn>
-rw-r--r--tosca2heat/heat-translator/.coveragerc7
-rw-r--r--tosca2heat/heat-translator/.testr.conf7
-rw-r--r--tosca2heat/tosca-parser/.coveragerc7
-rw-r--r--tosca2heat/tosca-parser/.testr.conf7
4 files changed, 28 insertions, 0 deletions
diff --git a/tosca2heat/heat-translator/.coveragerc b/tosca2heat/heat-translator/.coveragerc
new file mode 100644
index 0000000..6c9ae08
--- /dev/null
+++ b/tosca2heat/heat-translator/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+branch = True
+source = translator
+omit = translator/openstack/*
+
+[report]
+ignore_errors = True
diff --git a/tosca2heat/heat-translator/.testr.conf b/tosca2heat/heat-translator/.testr.conf
new file mode 100644
index 0000000..fb62267
--- /dev/null
+++ b/tosca2heat/heat-translator/.testr.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+ ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list \ No newline at end of file
diff --git a/tosca2heat/tosca-parser/.coveragerc b/tosca2heat/tosca-parser/.coveragerc
new file mode 100644
index 0000000..3309d46
--- /dev/null
+++ b/tosca2heat/tosca-parser/.coveragerc
@@ -0,0 +1,7 @@
+[run]
+branch = True
+source = toscaparser
+omit = toscaparser/openstack/*
+
+[report]
+ignore_errors = True
diff --git a/tosca2heat/tosca-parser/.testr.conf b/tosca2heat/tosca-parser/.testr.conf
new file mode 100644
index 0000000..fb62267
--- /dev/null
+++ b/tosca2heat/tosca-parser/.testr.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
+ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+ ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
+test_id_option=--load-list $IDFILE
+test_list_option=--list \ No newline at end of file