From 90e24ebf87ed46e4fd5f0662f7a7a8fb0047b57d Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sat, 18 Dec 2010 16:06:52 +0100
Subject: [PATCH] [tests] fix tests

---
 tests/parsers.py                | 6 +++++-
 tests/specs/iso_to_image.common | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/parsers.py b/tests/parsers.py
index 05cb0b1..6129362 100644
--- a/tests/parsers.py
+++ b/tests/parsers.py
@@ -26,6 +26,7 @@ class ParsersTest(unittest.TestCase):
         from molecule.specs.plugins.remaster_plugin import RemasterSpec
 
         expected_data = {
+            'execution_strategy': "iso_remaster",
             'paths_to_remove': ['/this/and/that', '/that/and/this'],
             'post_iso_script': ['/sabayon/scripts/post_iso_script.sh'],
             'iso_title': 'Sabayon KDE',
@@ -67,6 +68,7 @@ class ParsersTest(unittest.TestCase):
         from molecule.specs.plugins.builtin_plugin import LivecdSpec
 
         expected_data = {
+            'execution_strategy': "livecd",
             'destination_iso_image_name': 'Sabayon_Linux_5.3_x86_chroot_TEST.iso',
             'post_iso_script': ['specs/data/post_iso_script.sh'],
             'extra_mkisofs_parameters': ['-b', 'isolinux/isolinux.bin', '-c',
@@ -144,6 +146,7 @@ class ParsersTest(unittest.TestCase):
         from molecule.specs.plugins.tar_plugin import IsoToTarSpec
 
         expected_data = {
+            'execution_strategy': "iso_to_tar",
             'iso_mounter': ['mount', '-t', 'iso9660', '-o', 'loop,ro'],
             'custom_packages_add_cmd': 'equo install --debug',
             'post_tar_script': ['specs/data/post_tar_script.sh'],
@@ -184,7 +187,8 @@ class ParsersTest(unittest.TestCase):
         from molecule.specs.plugins.image_plugin import IsoToImageSpec
 
         expected_data = {
-            'destination_image_directory': '/sabayon/images',
+            'execution_strategy': "iso_to_image",
+            'destination_image_directory': '/',
             'outer_chroot_script_after': [
                 '/path/to/script/to/be/executed/outside/after'],
             'iso_mounter': ['mount', '-t', 'iso9660', '-o', 'loop'],
diff --git a/tests/specs/iso_to_image.common b/tests/specs/iso_to_image.common
index d139885..11eea31 100644
--- a/tests/specs/iso_to_image.common
+++ b/tests/specs/iso_to_image.common
@@ -35,7 +35,7 @@ pre_image_script: /sabayon/scripts/pre_image_script.sh
 post_image_script: /sabayon/scripts/post_image_script.sh
 
 # Destination directory for the image path (MANDATORY)
-destination_image_directory: /sabayon/images
+destination_image_directory: /
 
 # Specify an alternative image file name (image file name will be automatically
 # produced otherwise)