[buildd-tools-devel] [PATCH 06/11] [test] Cleanup keyfile and environment tests

Jan-Marek Glogowski glogow at fbihome.de
Mon Aug 10 18:12:15 UTC 2009


Cleanup for block-device, file, loopback and lvm-snapshot tests.
---
 test/sbuild-chroot-block-device.cc |   33 +++++++++--------------
 test/sbuild-chroot-file.cc         |   50 +++++++++++++++++++----------------
 test/sbuild-chroot-loopback.cc     |   33 +++++++++--------------
 test/sbuild-chroot-lvm-snapshot.cc |   45 +++++++++++++++-----------------
 4 files changed, 74 insertions(+), 87 deletions(-)

diff --git a/test/sbuild-chroot-block-device.cc b/test/sbuild-chroot-block-device.cc
index 3a8e703..618742c 100644
--- a/test/sbuild-chroot-block-device.cc
+++ b/test/sbuild-chroot-block-device.cc
@@ -216,15 +216,20 @@ public:
   }
 #endif // SBUILD_FEATURE_UNION
 
-  void test_setup_keyfile()
+  void setup_keyfile_block(sbuild::keyfile &expected, std::string group)
   {
-    sbuild::keyfile expected;
-    std::string group = chroot->get_name();
-    setup_keyfile_chroot(expected, group);
     expected.set_value(group, "type", "block-device");
     expected.set_value(group, "device", "/dev/testdev");
     expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
+  }
+
+  void test_setup_keyfile()
+  {
+    sbuild::keyfile expected;
+    std::string group = chroot->get_name();
+    setup_keyfile_chroot(expected, group);
+    setup_keyfile_block(expected, group);
     setup_keyfile_union_unconfigured(expected, group);
 
     test_chroot_base<chroot_block_device>::test_setup_keyfile
@@ -236,13 +241,10 @@ public:
     sbuild::keyfile expected;
     const std::string group(session->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "type", "block-device");
+    setup_keyfile_block(expected, group);
     expected.set_value(group, "name", "test-session-name");
-    expected.set_value(group, "device", "/dev/testdev");
-    expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "mount-device", "/dev/testdev");
     expected.set_value(group, "mount-location", "/mnt/mount-location");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     setup_keyfile_session_clone(expected, group);
     setup_keyfile_union_unconfigured(expected, group);
 
@@ -258,10 +260,7 @@ public:
     setup_keyfile_union_configured(expected, group);
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "type", "block-device");
-    expected.set_value(group, "device", "/dev/testdev");
-    expected.set_value(group, "location", "/squeeze");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
+    setup_keyfile_block(expected, group);
 
     test_chroot_base<chroot_block_device>::test_setup_keyfile
       (chroot_union, expected, group);
@@ -272,13 +271,10 @@ public:
     sbuild::keyfile expected;
     const std::string group(session_union->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "type", "block-device");
+    setup_keyfile_block(expected, group);
     expected.set_value(group, "name", "test-union-session-name");
-    expected.set_value(group, "device", "/dev/testdev");
-    expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "mount-device", "/dev/testdev");
     expected.set_value(group, "mount-location", "/mnt/mount-location");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     setup_keyfile_session_clone(expected, group);
     setup_keyfile_union_session(expected, group);
 
@@ -292,11 +288,8 @@ public:
     const std::string group(source_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "type", "block-device");
+    setup_keyfile_block(expected, group);
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
-    expected.set_value(group, "device", "/dev/testdev");
-    expected.set_value(group, "location", "/squeeze");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     setup_keyfile_union_unconfigured(expected, group);
 
     test_chroot_base<chroot_block_device>::test_setup_keyfile
diff --git a/test/sbuild-chroot-file.cc b/test/sbuild-chroot-file.cc
index 6fec146..ecd01d8 100644
--- a/test/sbuild-chroot-file.cc
+++ b/test/sbuild-chroot-file.cc
@@ -112,9 +112,8 @@ public:
     CPPUNIT_ASSERT(fs->get_file_repack() == true);
   }
 
-  void test_setup_env()
+  void setup_env_gen(sbuild::environment &expected)
   {
-    sbuild::environment expected;
     setup_env_chroot(expected);
     expected.add("CHROOT_TYPE",            "file");
     expected.add("CHROOT_FILE",            "/srv/chroot/example.tar.bz2");
@@ -129,18 +128,25 @@ public:
     test_chroot_base<chroot_file>::test_setup_env(chroot, expected);
   }
 
+  void test_setup_env()
+  {
+    sbuild::environment expected;
+    setup_env_gen(expected);
+    expected.add("CHROOT_FILE_REPACK",    "false");
+    expected.add("CHROOT_SESSION_CLONE",  "true");
+    expected.add("CHROOT_SESSION_CREATE", "true");
+    expected.add("CHROOT_SESSION_PURGE",  "false");
+
+    test_chroot_base<chroot_file>::test_setup_env(chroot, expected);
+  }
+
   void test_setup_env_session()
   {
     sbuild::environment expected;
-    setup_env_chroot(expected);
-    expected.add("CHROOT_TYPE",           "file");
+    setup_env_gen(expected);
     expected.add("CHROOT_NAME",           "test-session-name");
-    expected.add("CHROOT_DESCRIPTION",     chroot->get_description() + ' ' + _("(session chroot)"));
-    expected.add("CHROOT_FILE",            "/srv/chroot/example.tar.bz2");
-    expected.add("CHROOT_FILE_REPACK",     "false");
-    expected.add("CHROOT_FILE_UNPACK_DIR", SCHROOT_FILE_UNPACK_DIR);
-    expected.add("CHROOT_MOUNT_LOCATION",  "/mnt/mount-location");
-    expected.add("CHROOT_PATH",            "/mnt/mount-location");
+    expected.add("CHROOT_DESCRIPTION",    chroot->get_description() + ' ' + _("(session chroot)"));
+    expected.add("CHROOT_FILE_REPACK",    "false");
     expected.add("CHROOT_SESSION_CLONE",  "false");
     expected.add("CHROOT_SESSION_CREATE", "false");
     expected.add("CHROOT_SESSION_PURGE",  "true");
@@ -151,15 +157,10 @@ public:
   void test_setup_env_source()
   {
     sbuild::environment expected;
-    setup_env_chroot(expected);
-    expected.add("CHROOT_TYPE",           "file");
+    setup_env_gen(expected);
     expected.add("CHROOT_NAME",           "test-name-source");
     expected.add("CHROOT_DESCRIPTION",    chroot->get_description() + ' ' + _("(source chroot)"));
-    expected.add("CHROOT_FILE",            "/srv/chroot/example.tar.bz2");
-    expected.add("CHROOT_FILE_REPACK",     "true");
-    expected.add("CHROOT_FILE_UNPACK_DIR", SCHROOT_FILE_UNPACK_DIR);
-    expected.add("CHROOT_MOUNT_LOCATION",  "/mnt/mount-location");
-    expected.add("CHROOT_PATH",            "/mnt/mount-location");
+    expected.add("CHROOT_FILE_REPACK",    "true");
     expected.add("CHROOT_SESSION_CLONE",  "false");
     expected.add("CHROOT_SESSION_CREATE", "true");
     expected.add("CHROOT_SESSION_PURGE",  "false");
@@ -167,14 +168,19 @@ public:
     test_chroot_base<chroot_file>::test_setup_env(source, expected);
   }
 
+  void setup_keyfile_file(sbuild::keyfile &expected, const std::string group)
+  {
+    expected.set_value(group, "type", "file");
+    expected.set_value(group, "file", "/srv/chroot/example.tar.bz2");
+  }
+
   void test_setup_keyfile()
   {
     sbuild::keyfile expected;
     const std::string group(chroot->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "type", "file");
-    expected.set_value(group, "file", "/srv/chroot/example.tar.bz2");
+    setup_keyfile_file(expected, group);
 
     test_chroot_base<chroot_file>::test_setup_keyfile
       (chroot, expected, group);
@@ -185,9 +191,8 @@ public:
     sbuild::keyfile expected;
     const std::string group(session->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "type", "file");
+    setup_keyfile_file(expected, group);
     expected.set_value(group, "name", "test-session-name");
-    expected.set_value(group, "file", "/srv/chroot/example.tar.bz2");
     expected.set_value(group, "file-repack", "false");
     expected.set_value(group, "mount-location", "/mnt/mount-location");
     setup_keyfile_session_clone(expected, group);
@@ -202,9 +207,8 @@ public:
     const std::string group(source->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "type", "file");
+    setup_keyfile_file(expected, group);
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
-    expected.set_value(group, "file", "/srv/chroot/example.tar.bz2");
 
     test_chroot_base<chroot_file>::test_setup_keyfile
       (source, expected, group);
diff --git a/test/sbuild-chroot-loopback.cc b/test/sbuild-chroot-loopback.cc
index 78396bc..a575e22 100644
--- a/test/sbuild-chroot-loopback.cc
+++ b/test/sbuild-chroot-loopback.cc
@@ -216,15 +216,20 @@ public:
   }
 #endif // SBUILD_FEATURE_UNION
 
-  void test_setup_keyfile()
+  void setup_keyfile_loop(sbuild::keyfile &expected, std::string group)
   {
-    sbuild::keyfile expected;
-    const std::string group(chroot->get_name());
-    setup_keyfile_chroot(expected, group);
     expected.set_value(group, "type", "loopback");
     expected.set_value(group, "file", loopback_file);
     expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
+  }
+
+  void test_setup_keyfile()
+  {
+    sbuild::keyfile expected;
+    const std::string group(chroot->get_name());
+    setup_keyfile_chroot(expected, group);
+    setup_keyfile_loop(expected, group);
     setup_keyfile_union_unconfigured(expected, group);
 
     test_chroot_base<chroot_loopback>::test_setup_keyfile
@@ -236,13 +241,10 @@ public:
     sbuild::keyfile expected;
     const std::string group(session->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "type", "loopback");
+    setup_keyfile_loop(expected, group);
     expected.set_value(group, "name", "test-session-name");
-    expected.set_value(group, "file", loopback_file);
-    expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "mount-device", loopback_file);
     expected.set_value(group, "mount-location", "/mnt/mount-location");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     setup_keyfile_session_clone(expected, group);
     setup_keyfile_union_unconfigured(expected, group);
 
@@ -257,10 +259,7 @@ public:
     const std::string group(chroot_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "type", "loopback");
-    expected.set_value(group, "file", loopback_file);
-    expected.set_value(group, "location", "/squeeze");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
+    setup_keyfile_loop(expected, group);
     setup_keyfile_union_configured(expected, group);
 
     test_chroot_base<chroot_loopback>::test_setup_keyfile
@@ -272,13 +271,10 @@ public:
     sbuild::keyfile expected;
     const std::string group(session_union->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "type", "loopback");
+    setup_keyfile_loop(expected, group);
     expected.set_value(group, "name", "test-union-session-name");
-    expected.set_value(group, "file", loopback_file);
-    expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "mount-device", loopback_file);
     expected.set_value(group, "mount-location", "/mnt/mount-location");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     setup_keyfile_session_clone(expected, group);
     setup_keyfile_union_session(expected, group);
 
@@ -292,11 +288,8 @@ public:
     const std::string group(source_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "type", "loopback");
+    setup_keyfile_loop(expected, group);
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
-    expected.set_value(group, "file", loopback_file);
-    expected.set_value(group, "location", "/squeeze");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     setup_keyfile_union_unconfigured(expected, group);
 
     test_chroot_base<chroot_loopback>::test_setup_keyfile
diff --git a/test/sbuild-chroot-lvm-snapshot.cc b/test/sbuild-chroot-lvm-snapshot.cc
index 1425c3c..cc7330a 100644
--- a/test/sbuild-chroot-lvm-snapshot.cc
+++ b/test/sbuild-chroot-lvm-snapshot.cc
@@ -119,16 +119,21 @@ public:
     CPPUNIT_ASSERT(chroot->get_chroot_type() == "lvm-snapshot");
   }
 
-  void test_setup_env()
+  void setup_env_gen(sbuild::environment &expected)
   {
-    sbuild::environment expected;
     setup_env_chroot(expected);
-    expected.add("CHROOT_TYPE",           "lvm-snapshot");
     expected.add("CHROOT_LOCATION",       "/squeeze");
     expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
     expected.add("CHROOT_PATH",           "/mnt/mount-location/squeeze");
     expected.add("CHROOT_DEVICE",         "/dev/volgroup/testdev");
     expected.add("CHROOT_MOUNT_OPTIONS",  "-t jfs -o quota,rw");
+  }
+
+  void test_setup_env()
+  {
+    sbuild::environment expected;
+    setup_env_gen(expected);
+    expected.add("CHROOT_TYPE",           "lvm-snapshot");
     expected.add("CHROOT_LVM_SNAPSHOT_OPTIONS", "--size 1G");
     expected.add("CHROOT_SESSION_CLONE",  "true");
     expected.add("CHROOT_SESSION_CREATE", "true");
@@ -142,16 +147,11 @@ public:
     std::tr1::shared_ptr<sbuild::chroot_lvm_snapshot> c = std::tr1::dynamic_pointer_cast<sbuild::chroot_lvm_snapshot>(chroot);
 
     sbuild::environment expected;
-    setup_env_chroot(expected);
+    setup_env_gen(expected);
     expected.add("CHROOT_TYPE",           "lvm-snapshot");
     expected.add("CHROOT_NAME",           "test-session-name");
     expected.add("CHROOT_DESCRIPTION",     chroot->get_description() + ' ' + _("(session chroot)"));
-    expected.add("CHROOT_LOCATION",       "/squeeze");
-    expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
-    expected.add("CHROOT_PATH",           "/mnt/mount-location/squeeze");
-    expected.add("CHROOT_DEVICE",         "/dev/volgroup/testdev");
     expected.add("CHROOT_MOUNT_DEVICE",   "/dev/volgroup/test-session-name");
-    expected.add("CHROOT_MOUNT_OPTIONS",  "-t jfs -o quota,rw");
     expected.add("CHROOT_LVM_SNAPSHOT_NAME",    "test-session-name");
     expected.add("CHROOT_LVM_SNAPSHOT_DEVICE",  "/dev/volgroup/test-session-name");
     expected.add("CHROOT_LVM_SNAPSHOT_OPTIONS", "--size 1G");
@@ -165,16 +165,11 @@ public:
   void test_setup_env_source()
   {
     sbuild::environment expected;
-    setup_env_chroot(expected);
+    setup_env_gen(expected);
     expected.add("CHROOT_TYPE",           "block-device");
     expected.add("CHROOT_NAME",           "test-name-source");
     expected.add("CHROOT_DESCRIPTION",     chroot->get_description() + ' ' + _("(source chroot)"));
-    expected.add("CHROOT_LOCATION",       "/squeeze");
-    expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
-    expected.add("CHROOT_PATH",           "/mnt/mount-location/squeeze");
-    expected.add("CHROOT_DEVICE",         "/dev/volgroup/testdev");
     expected.add("CHROOT_MOUNT_DEVICE",   "/dev/volgroup/testdev");
-    expected.add("CHROOT_MOUNT_OPTIONS",  "-t jfs -o quota,rw");
     expected.add("CHROOT_SESSION_CLONE",  "false");
     expected.add("CHROOT_SESSION_CREATE", "true");
     expected.add("CHROOT_SESSION_PURGE",  "false");
@@ -183,16 +178,21 @@ public:
     test_chroot_base<chroot_lvm_snapshot>::test_setup_env(source, expected);
   }
 
+  void setup_keyfile_lvm(sbuild::keyfile &expected, std::string group)
+  {
+    expected.set_value(group, "device", "/dev/volgroup/testdev");
+    expected.set_value(group, "location", "/squeeze");
+    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
+  }
+
   void test_setup_keyfile()
   {
     sbuild::keyfile expected;
     std::string group = chroot->get_name();
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
+    setup_keyfile_lvm(expected, group);
     expected.set_value(group, "type", "lvm-snapshot");
-    expected.set_value(group, "device", "/dev/volgroup/testdev");
-    expected.set_value(group, "location", "/squeeze");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     expected.set_value(group, "lvm-snapshot-options", "--size 1G");
 
     test_chroot_base<chroot_lvm_snapshot>::test_setup_keyfile
@@ -204,16 +204,15 @@ public:
     sbuild::keyfile expected;
     const std::string group(session->get_name());
     setup_keyfile_chroot(expected, group);
+    setup_keyfile_lvm(expected, group);
     expected.set_value(group, "type", "lvm-snapshot");
     expected.set_value(group, "name", "test-session-name");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(session chroot)"));
     expected.set_value(group, "aliases", "");
-    expected.set_value(group, "device", "/dev/volgroup/testdev");
-    expected.set_value(group, "location", "/squeeze");
     expected.set_value(group, "lvm-snapshot-device", "/dev/volgroup/test-session-name");
     expected.set_value(group, "mount-device", "/dev/volgroup/test-session-name");
     expected.set_value(group, "mount-location", "/mnt/mount-location");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
+    expected.set_value(group, "mount-device", "/dev/volgroup/test-session-name");
 
     test_chroot_base<chroot_lvm_snapshot>::test_setup_keyfile
       (session, expected, group);
@@ -224,12 +223,10 @@ public:
     sbuild::keyfile expected;
     const std::string group(source->get_name());
     setup_keyfile_chroot(expected, group);
+    setup_keyfile_lvm(expected, group);
     expected.set_value(group, "type", "block-device");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     expected.set_value(group, "aliases", "test-alias-1-source,test-alias-2-source");
-    expected.set_value(group, "device", "/dev/volgroup/testdev");
-    expected.set_value(group, "location", "/squeeze");
-    expected.set_value(group, "mount-options", "-t jfs -o quota,rw");
     expected.set_value(group, "union-type", "none");
     setup_keyfile_source_clone(expected, group);
 
-- 
1.6.4




More information about the Buildd-tools-devel mailing list