From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 15 Sep 2018 13:32:22 +0000 (+0100)
Subject: nitsi: Remove lines that are already in the default settings file
X-Git-Tag: 010~115
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=commitdiff_plain;h=ca4850b0a954d57b00d0508bb5d7f2ebda06ed08

nitsi: Remove lines that are already in the default settings file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings
index ab79a30e..35aeb024 100644
--- a/test/nitsi/test/hello-world/settings
+++ b/test/nitsi/test/hello-world/settings
@@ -1,7 +1,3 @@
 [GENERAL]
 name = Hello World
 description = This is a test to just check if nitsi is working.
-
-[VIRTUAL_ENVIRONMENT]
-path = ../../virtual-environment/basic
-
diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-check/settings.in
index 78d6fe0f..2dcc6bec 100644
--- a/test/nitsi/test/make-check/settings.in
+++ b/test/nitsi/test/make-check/settings.in
@@ -3,9 +3,3 @@ name = make check
 description = This test runs make install in the virtual environment
 	to determine if the source tarball is complete and module test
 	can be executed in the virtual environment
-
-copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
-copy_to = /root/
-
-[VIRTUAL_ENVIRONMENT]
-path = ../../virtual-environment/basic
diff --git a/test/nitsi/test/raw-device-get-by-mac/settings.in b/test/nitsi/test/raw-device-get-by-mac/settings.in
index e0bc1410..c45b353b 100644
--- a/test/nitsi/test/raw-device-get-by-mac/settings.in
+++ b/test/nitsi/test/raw-device-get-by-mac/settings.in
@@ -1,8 +1,3 @@
 [GENERAL]
 name = raw-device-get-by-mac
 description = This test checks if 'network raw device-get-by-mac' return the correct device for a given mac
-copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
-copy_to = /root/
-
-[VIRTUAL_ENVIRONMENT]
-path = ../../virtual-environment/basic
diff --git a/test/nitsi/test/zone-new-bridge/settings.in b/test/nitsi/test/zone-new-bridge/settings.in
index 207cfa05..e8a07e4d 100644
--- a/test/nitsi/test/zone-new-bridge/settings.in
+++ b/test/nitsi/test/zone-new-bridge/settings.in
@@ -1,9 +1,3 @@
 [GENERAL]
 name = zone-new-bridge
 description = This test checks if we can create a new zone of the type 'bridge'
-
-copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
-copy_to = /root/
-
-[VIRTUAL_ENVIRONMENT]
-path = ../../virtual-environment/basic
diff --git a/test/nitsi/test/zone-port-attach-bridge/settings.in b/test/nitsi/test/zone-port-attach-bridge/settings.in
index c52be6dc..a9963a14 100644
--- a/test/nitsi/test/zone-port-attach-bridge/settings.in
+++ b/test/nitsi/test/zone-port-attach-bridge/settings.in
@@ -1,9 +1,3 @@
 [GENERAL]
 name = zone-port-attach-bridge
 description = This test checks if we cann attach a dummy port to a zone
-
-copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
-copy_to = /root/
-
-[VIRTUAL_ENVIRONMENT]
-path = ../../virtual-environment/basic