Change in vdsm[master]: tests: move sourcerouting_test to tests/net where it belongs

danken at redhat.com danken at redhat.com
Fri Mar 18 12:20:49 UTC 2016


Dan Kenigsberg has uploaded a new change for review.

Change subject: tests: move sourcerouting_test to tests/net where it belongs
......................................................................

tests: move sourcerouting_test to tests/net where it belongs

Change-Id: I1caeaec31f4dfe2717a6cc3fded5fc937a909e25
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M debian/vdsm-tests.install
M tests/Makefile.am
M tests/network/Makefile.am
R tests/network/ip_route_show_table_all.out
R tests/network/sourcerouting_test.py
M vdsm.spec.in
6 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/23/54923/1

diff --git a/debian/vdsm-tests.install b/debian/vdsm-tests.install
index 95579bd..6c810c3 100644
--- a/debian/vdsm-tests.install
+++ b/debian/vdsm-tests.install
@@ -25,6 +25,7 @@
 usr/share/vdsm/tests/lvs_3386c6f2-926f-42c4-839c-38287fac8998.out
 usr/share/vdsm/tests/mem_info.out
 usr/share/vdsm/tests/network/*.py
+usr/share/vdsm/tests/network/ip_route_show_table_all.out
 usr/share/vdsm/tests/network/netmaskconversions
 usr/share/vdsm/tests/network/tc_filter_show.out
 usr/share/vdsm/tests/run_tests.sh
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7446760..b337a4d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -112,7 +112,6 @@
 	schemaValidationTest.py \
 	sdm_indirection_tests.py \
 	securableTests.py \
-	sourceroutingTests.py \
 	sparsifyTests.py \
 	sslTests.py \
 	stompAdapterTests.py \
@@ -201,7 +200,6 @@
 	glusterVolumeRebalanceStatus.xml \
 	glusterVolumeRemoveBricksStatus.xml \
 	glusterVolumeTasks.xml \
-	ip_route_show_table_all.out \
 	iscsiadm_-m_iface.out \
 	lvs_3386c6f2-926f-42c4-839c-38287fac8998.out \
 	mem_info.out \
diff --git a/tests/network/Makefile.am b/tests/network/Makefile.am
index 3d3ca49..9d4f7a8 100644
--- a/tests/network/Makefile.am
+++ b/tests/network/Makefile.am
@@ -29,6 +29,7 @@
 	$(NULL)
 
 dist_vdsmnetworktests_DATA = \
+	ip_route_show_table_all.out \
 	netmaskconversions \
 	tc_filter_show.out \
 	$(NULL)
diff --git a/tests/ip_route_show_table_all.out b/tests/network/ip_route_show_table_all.out
similarity index 100%
rename from tests/ip_route_show_table_all.out
rename to tests/network/ip_route_show_table_all.out
diff --git a/tests/sourceroutingTests.py b/tests/network/sourcerouting_test.py
similarity index 96%
rename from tests/sourceroutingTests.py
rename to tests/network/sourcerouting_test.py
index 37bf642..179d18a 100644
--- a/tests/sourceroutingTests.py
+++ b/tests/network/sourcerouting_test.py
@@ -18,6 +18,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
+from __future__ import absolute_import
 import os
 
 from testlib import VdsmTestCase as TestCaseBase
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 0c982e4..34f4554 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1237,11 +1237,11 @@
 %{_datadir}/%{vdsm_name}/tests/devices/*.py*
 %{_datadir}/%{vdsm_name}/tests/devices/parsing/*.py*
 %{_datadir}/%{vdsm_name}/tests/devices/data/*.xml
-%{_datadir}/%{vdsm_name}/tests/ip_route_show_table_all.out
 %{_datadir}/%{vdsm_name}/tests/iscsiadm_-m_iface.out
 %{_datadir}/%{vdsm_name}/tests/lvs_3386c6f2-926f-42c4-839c-38287fac8998.out
 %{_datadir}/%{vdsm_name}/tests/mem_info.out
 %{_datadir}/%{vdsm_name}/tests/network/*.py*
+%{_datadir}/%{vdsm_name}/tests/network/ip_route_show_table_all.out
 %{_datadir}/%{vdsm_name}/tests/network/netmaskconversions
 %{_datadir}/%{vdsm_name}/tests/network/tc_filter_show.out
 %{_datadir}/%{vdsm_name}/tests/run_tests.sh


-- 
To view, visit https://gerrit.ovirt.org/54923
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1caeaec31f4dfe2717a6cc3fded5fc937a909e25
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list