Nitsi is now using subparsers so we have to add 'run-test' to the command line.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am index 8139399..f11c721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -601,7 +601,7 @@ NITSI_ENVIRONMENT =
.PHONY: $(NITSI_TESTS) $(NITSI_TESTS): % : %/recipe %/settings $(VIRTUAL_ENVIRONMENT_FILES) $(VIRTUAL_ENVIRONMENT_IMAGES) - $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error -d $@ + $(AM_V_NITSI) $(NITSI_ENVIRONMENT) $(NITSI) --log-level error run-test -d $@
.PHONY: nitsi nitsi: dist $(NITSI_TESTS)
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(-)
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
When we do not change this path accordingly to the place where we store our images the copy in feature does not work.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org --- Makefile.am | 6 ++++-- test/nitsi/virtual-environment/basic/.gitignore | 1 + test/nitsi/virtual-environment/basic/{settings => settings.in} | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 test/nitsi/virtual-environment/basic/.gitignore rename test/nitsi/virtual-environment/basic/{settings => settings.in} (84%)
diff --git a/Makefile.am b/Makefile.am index f11c721..b976da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -563,13 +563,15 @@ EXTRA_DIST += \ test/nitsi/virtual-environment/basic/machines/alice/machine.xml.in \ test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml.in \ test/nitsi/virtual-environment/basic/machines/bob/machine.xml.in \ - test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in + test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml.in \ + test/nitsi/virtual-environment/basic/settings.in
CLEANFILES += \ test/nitsi/virtual-environment/basic/machines/alice/machine.xml \ test/nitsi/virtual-environment/basic/machines/alice/snapshot.xml \ test/nitsi/virtual-environment/basic/machines/bob/machine.xml \ - test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml + test/nitsi/virtual-environment/basic/machines/bob/snapshot.xml \ + test/nitsi/virtual-environment/basic/settings
# Virtual Machine Images VIRTUAL_ENVIRONMENT_IMAGES = \ diff --git a/test/nitsi/virtual-environment/basic/.gitignore b/test/nitsi/virtual-environment/basic/.gitignore new file mode 100644 index 0000000..308ef0b --- /dev/null +++ b/test/nitsi/virtual-environment/basic/.gitignore @@ -0,0 +1 @@ +/settings diff --git a/test/nitsi/virtual-environment/basic/settings b/test/nitsi/virtual-environment/basic/settings.in similarity index 84% rename from test/nitsi/virtual-environment/basic/settings rename to test/nitsi/virtual-environment/basic/settings.in index 44805ae..94d2090 100644 --- a/test/nitsi/virtual-environment/basic/settings +++ b/test/nitsi/virtual-environment/basic/settings.in @@ -7,7 +7,7 @@ uri = qemu:///system [alice] xml_file = machines/alice/machine.xml snapshot_xml_file = machines/alice/snapshot.xml -image = /var/lib/libvirt/images/ipfire-alice.qcow2 +image = @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-alice-2.qcow2 root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d username = root password = root @@ -15,7 +15,7 @@ password = root [bob] xml_file = machines/bob/machine.xml snapshot_xml_file = machines/bob/snapshot.xml -image = /var/lib/libvirt/images/ipfire-bob.qcow2 +image = @VIRTUAL_ENVIRONMENT_IMAGES_DIR@/ipfire-bob.qcow2 root_uid = 1efb5389-0949-46bb-b688-5246acba9f6d username = root password = root
-
Jonatan Schlag