[2/3] Adapt settings file of nitsi tests to new syntax

Message ID 20180625090143.31218-2-jonatan.schlag@ipfire.org
State Accepted
Commit ae717b83d0b2f7046db7c84f9298469b72988791
Headers
Series [1/3] Adapt nitsi command line to new syntax |

Commit Message

Jonatan Schlag June 25, 2018, 7:01 p.m. UTC
  Nitsi is using a new syntax for settings file so we need to change the
settings files of our tests.

I dropped some settings in the hello-world test because we do not need
them for this test.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 test/nitsi/test/hello-world/settings   | 10 +++-------
 test/nitsi/test/make-check/settings.in | 11 +++++------
 2 files changed, 8 insertions(+), 13 deletions(-)
  

Patch

diff --git a/test/nitsi/test/hello-world/settings b/test/nitsi/test/hello-world/settings
index ee066ce..ab79a30 100644
--- a/test/nitsi/test/hello-world/settings
+++ b/test/nitsi/test/hello-world/settings
@@ -1,11 +1,7 @@ 
-[DEFAULT]
-Name = Hello World
-Description = This is a test to just check if nitsi is working.
-
-Copy_from =
-Copy_to = /root/
+[GENERAL]
+name = Hello World
+description = This is a test to just check if nitsi is working.
 
 [VIRTUAL_ENVIRONMENT]
-Name = basic
 path = ../../virtual-environment/basic
 
diff --git a/test/nitsi/test/make-check/settings.in b/test/nitsi/test/make-check/settings.in
index cac865d..78d6fe0 100644
--- a/test/nitsi/test/make-check/settings.in
+++ b/test/nitsi/test/make-check/settings.in
@@ -1,12 +1,11 @@ 
-[DEFAULT]
-Name = make check
-Description = This test runs make install in the virtual environment
+[GENERAL]
+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/
+copy_from = ../../../../@PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
+copy_to = /root/
 
 [VIRTUAL_ENVIRONMENT]
-Name = basic
 path = ../../virtual-environment/basic