[buildd-tools-devel] [PATCH 1/8] [tests] Fixes for changed run_setup_scripts default

[Jan-Marek Glogowski]

---
 test/sbuild-chroot-block-device.cc |    4 ++--
 test/sbuild-chroot-directory.cc    |   10 +++++-----
 test/sbuild-chroot.cc              |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/sbuild-chroot-block-device.cc b/test/sbuild-chroot-block-device.cc
index 0dd3ea5..3bbd3ca 100644
--- a/test/sbuild-chroot-block-device.cc
+++ b/test/sbuild-chroot-block-device.cc
@@ -106,7 +106,7 @@ public:
     expected.add("CHROOT_MOUNT_OPTIONS",  "-t jfs -o quota,rw");
     expected.add("CHROOT_SCRIPT_CONFIG",  sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
     expected.add("CHROOT_SESSION_CLONE",  "false");
-    expected.add("CHROOT_SESSION_CREATE", "false");
+    expected.add("CHROOT_SESSION_CREATE", "true");
     expected.add("CHROOT_SESSION_PURGE",  "false");
 
     test_chroot_base<chroot_block_device>::test_setup_env(expected);
@@ -115,7 +115,7 @@ public:
   void test_session_flags()
   {
     CPPUNIT_ASSERT(chroot->get_session_flags() ==
-		   sbuild::chroot::SESSION_NOFLAGS);
+		   sbuild::chroot::SESSION_CREATE);
   }
 
   void test_print_details()
diff --git a/test/sbuild-chroot-directory.cc b/test/sbuild-chroot-directory.cc
index 7124ce2..5d3d8fa 100644
--- a/test/sbuild-chroot-directory.cc
+++ b/test/sbuild-chroot-directory.cc
@@ -87,6 +87,8 @@ public:
 
   void test_setup_env()
   {
+    chroot->set_run_setup_scripts(false);
+
     sbuild::environment expected;
     expected.add("CHROOT_TYPE",           "directory");
     expected.add("CHROOT_NAME",           "test-name");
@@ -104,8 +106,6 @@ public:
 
   void test_setup_env2()
   {
-    chroot->set_run_setup_scripts(true);
-
     sbuild::environment expected;
     expected.add("CHROOT_TYPE",           "directory");
     expected.add("CHROOT_NAME",           "test-name");
@@ -124,11 +124,11 @@ public:
   void test_session_flags()
   {
     CPPUNIT_ASSERT(chroot->get_session_flags() ==
-		   sbuild::chroot::SESSION_NOFLAGS);
+		   sbuild::chroot::SESSION_CREATE);
 
-    chroot->set_run_setup_scripts(true);
+    chroot->set_run_setup_scripts(false);
     CPPUNIT_ASSERT(chroot->get_session_flags() ==
-		   sbuild::chroot::SESSION_CREATE);
+		   sbuild::chroot::SESSION_NOFLAGS);
   }
 
   void test_print_details()
diff --git a/test/sbuild-chroot.cc b/test/sbuild-chroot.cc
index 34cce59..d7e2ad0 100644
--- a/test/sbuild-chroot.cc
+++ b/test/sbuild-chroot.cc
@@ -177,11 +177,11 @@ public:
 
   void test_run_setup_scripts()
   {
-    CPPUNIT_ASSERT(chroot->get_run_setup_scripts() == false);
-    chroot->set_run_setup_scripts(true);
     CPPUNIT_ASSERT(chroot->get_run_setup_scripts() == true);
     chroot->set_run_setup_scripts(false);
     CPPUNIT_ASSERT(chroot->get_run_setup_scripts() == false);
+    chroot->set_run_setup_scripts(true);
+    CPPUNIT_ASSERT(chroot->get_run_setup_scripts() == true);
   }
 
   void test_chroot_type()
-- 
1.6.3.1