summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-07-12 10:52:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-12 10:52:42 +0000
commit73b9fc92e8aed02291878d558ed370239b25c2f1 (patch)
tree746b3228ba8c67c37c6d6e34381b1b7f0bf330a6
parent17487061550ff71791f28a83cea0aa41a8c10bc7 (diff)
parent405c02c77fce358d3005732b6e220e83ddef75a3 (diff)
Merge changes from topics 'fix_unix_rights_py', 'stop_creating_ODL_dir'
* changes: Chmod 755 all py files which can be executed Stop creating the useless ODL results dir
-rwxr-xr-x[-rw-r--r--]ci/prepare_env.py7
-rwxr-xr-x[-rw-r--r--]ci/run_tests.py0
-rwxr-xr-x[-rw-r--r--]testcases/Controllers/ODL/odlreport2db.py0
-rwxr-xr-x[-rw-r--r--]testcases/Controllers/ONOS/Teston/onosfunctest.py0
-rwxr-xr-x[-rw-r--r--]testcases/OpenStack/examples/create_instance_and_ip.py0
-rwxr-xr-x[-rw-r--r--]testcases/OpenStack/tempest/run_tempest.py0
-rwxr-xr-x[-rw-r--r--]testcases/OpenStack/vPing/vPing_ssh.py0
-rwxr-xr-x[-rw-r--r--]testcases/OpenStack/vPing/vPing_userdata.py0
-rwxr-xr-x[-rw-r--r--]testcases/features/bgpvpn.py0
-rwxr-xr-x[-rw-r--r--]testcases/features/doctor.py0
-rwxr-xr-x[-rw-r--r--]testcases/features/promise.py0
-rwxr-xr-x[-rw-r--r--]testcases/features/sfc/sfc.py0
-rwxr-xr-x[-rw-r--r--]testcases/security_scan/security_scan.py0
-rwxr-xr-x[-rw-r--r--]testcases/vnf/vIMS/vIMS.py0
-rwxr-xr-x[-rw-r--r--]utils/openstack_clean.py0
-rwxr-xr-x[-rw-r--r--]utils/openstack_snapshot.py0
16 files changed, 0 insertions, 7 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index 4f29260f6..ed6a4ed5f 100644..100755
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -133,13 +133,6 @@ def create_directories():
else:
logger.debug(" %s already exists." % FUNCTEST_DATA_DIR)
- ODL_RESULTS_DIR = FUNCTEST_RESULTS_DIR + "/ODL/"
- if not os.path.exists(ODL_RESULTS_DIR):
- os.makedirs(ODL_RESULTS_DIR)
- logger.info(" %s created." % ODL_RESULTS_DIR)
- else:
- logger.debug(" %s already exists." % ODL_RESULTS_DIR)
-
def source_rc_file():
print_separator()
diff --git a/ci/run_tests.py b/ci/run_tests.py
index 29b01d7ff..29b01d7ff 100644..100755
--- a/ci/run_tests.py
+++ b/ci/run_tests.py
diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
index 0c9f341c9..0c9f341c9 100644..100755
--- a/testcases/Controllers/ODL/odlreport2db.py
+++ b/testcases/Controllers/ODL/odlreport2db.py
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py
index b215b08ad..b215b08ad 100644..100755
--- a/testcases/Controllers/ONOS/Teston/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py
diff --git a/testcases/OpenStack/examples/create_instance_and_ip.py b/testcases/OpenStack/examples/create_instance_and_ip.py
index 41f8a9c8a..41f8a9c8a 100644..100755
--- a/testcases/OpenStack/examples/create_instance_and_ip.py
+++ b/testcases/OpenStack/examples/create_instance_and_ip.py
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index a16ba26f7..a16ba26f7 100644..100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
diff --git a/testcases/OpenStack/vPing/vPing_ssh.py b/testcases/OpenStack/vPing/vPing_ssh.py
index 1609dd95b..1609dd95b 100644..100755
--- a/testcases/OpenStack/vPing/vPing_ssh.py
+++ b/testcases/OpenStack/vPing/vPing_ssh.py
diff --git a/testcases/OpenStack/vPing/vPing_userdata.py b/testcases/OpenStack/vPing/vPing_userdata.py
index cdc411948..cdc411948 100644..100755
--- a/testcases/OpenStack/vPing/vPing_userdata.py
+++ b/testcases/OpenStack/vPing/vPing_userdata.py
diff --git a/testcases/features/bgpvpn.py b/testcases/features/bgpvpn.py
index bac255913..bac255913 100644..100755
--- a/testcases/features/bgpvpn.py
+++ b/testcases/features/bgpvpn.py
diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py
index ef55506af..ef55506af 100644..100755
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index fe1547af9..fe1547af9 100644..100755
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index dedf6e448..dedf6e448 100644..100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
diff --git a/testcases/security_scan/security_scan.py b/testcases/security_scan/security_scan.py
index d39c29052..d39c29052 100644..100755
--- a/testcases/security_scan/security_scan.py
+++ b/testcases/security_scan/security_scan.py
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
index 20a61158e..20a61158e 100644..100755
--- a/testcases/vnf/vIMS/vIMS.py
+++ b/testcases/vnf/vIMS/vIMS.py
diff --git a/utils/openstack_clean.py b/utils/openstack_clean.py
index 3eb39a260..3eb39a260 100644..100755
--- a/utils/openstack_clean.py
+++ b/utils/openstack_clean.py
diff --git a/utils/openstack_snapshot.py b/utils/openstack_snapshot.py
index 704ef5053..704ef5053 100644..100755
--- a/utils/openstack_snapshot.py
+++ b/utils/openstack_snapshot.py