[buildd-tools-devel] [PATCH 05/12] [test] Unify environment tests
Jan-Marek Glogowski
glogow at fbihome.de
Fri Jul 31 14:21:42 UTC 2009
The environment for unions and normal chroots just changes
marginally, so unify the reference environment setup.
---
test/sbuild-chroot-block-device.cc | 42 ++++++++++++-----------------------
test/sbuild-chroot-directory.cc | 34 +++++++++++++---------------
test/sbuild-chroot-loopback.cc | 40 ++++++++++++----------------------
3 files changed, 45 insertions(+), 71 deletions(-)
diff --git a/test/sbuild-chroot-block-device.cc b/test/sbuild-chroot-block-device.cc
index 8e4d4a2..01a1799 100644
--- a/test/sbuild-chroot-block-device.cc
+++ b/test/sbuild-chroot-block-device.cc
@@ -125,9 +125,8 @@ public:
CPPUNIT_ASSERT(chroot->get_chroot_type() == "block-device");
}
- void test_setup_env()
+ void setup_env_gen(sbuild::environment& expected)
{
- sbuild::environment expected;
setup_env_chroot(expected);
expected.add("CHROOT_TYPE", "block-device");
expected.add("CHROOT_LOCATION", "/squeeze");
@@ -136,6 +135,13 @@ public:
expected.add("CHROOT_DEVICE", "/dev/testdev");
expected.add("CHROOT_MOUNT_DEVICE", "/dev/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_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
@@ -150,21 +156,15 @@ public:
void test_setup_env_fsunion()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "block-device");
- 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/testdev");
- expected.add("CHROOT_MOUNT_DEVICE", "/dev/testdev");
- expected.add("CHROOT_MOUNT_OPTIONS", "-t jfs -o quota,rw");
+ setup_env_gen(expected);
+
expected.add("CHROOT_SESSION_CLONE", "true");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
expected.add("CHROOT_UNION_TYPE", "aufs");
expected.add("CHROOT_UNION_MOUNT_OPTIONS", "union-mount-options");
expected.add("CHROOT_UNION_OVERLAY_DIRECTORY", "/overlay");
- expected.add("CHROOT_UNION_UNDERLAY_DIRECTORY", "/underlay");
+ expected.add("CHROOT_UNION_UNDERLAY_DIRECTORY", "/underlay");
test_chroot_base<chroot_block_device>::test_setup_env(chroot_union, expected);
}
@@ -172,16 +172,10 @@ public:
void test_setup_env_session()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "block-device");
+ setup_env_gen(expected);
+
expected.add("CHROOT_NAME", "test-union-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/testdev");
- expected.add("CHROOT_MOUNT_DEVICE", "/dev/testdev");
- expected.add("CHROOT_MOUNT_OPTIONS", "-t jfs -o quota,rw");
expected.add("CHROOT_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "false");
expected.add("CHROOT_SESSION_PURGE", "true");
@@ -196,16 +190,10 @@ public:
void test_setup_env_source()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "block-device");
+ setup_env_gen(expected);
+
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/testdev");
- expected.add("CHROOT_MOUNT_DEVICE", "/dev/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");
diff --git a/test/sbuild-chroot-directory.cc b/test/sbuild-chroot-directory.cc
index 47da22c..cd2fa8d 100644
--- a/test/sbuild-chroot-directory.cc
+++ b/test/sbuild-chroot-directory.cc
@@ -107,19 +107,26 @@ public:
CPPUNIT_ASSERT(chroot->get_chroot_type() == "directory");
}
- void test_setup_env()
+ void setup_env_gen(sbuild::environment& expected)
{
- sbuild::environment expected;
setup_env_chroot(expected);
+
expected.add("CHROOT_TYPE", "directory");
expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
expected.add("CHROOT_DIRECTORY", "/srv/chroot/example-chroot");
expected.add("CHROOT_PATH", "/mnt/mount-location");
+ }
+
+ void test_setup_env()
+ {
+ sbuild::environment expected;
+ setup_env_gen(expected);
+
expected.add("CHROOT_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
#ifdef SBUILD_FEATURE_UNION
- expected.add("CHROOT_UNION_TYPE", "none");
+ expected.add("CHROOT_UNION_TYPE", "none");
#endif // SBUILD_FEATURE_UNION
test_chroot_base<chroot_directory>::test_setup_env(chroot, expected);
@@ -129,11 +136,8 @@ public:
void test_setup_env_fsunion()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "directory");
- expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
- expected.add("CHROOT_DIRECTORY", "/srv/chroot/example-chroot");
- expected.add("CHROOT_PATH", "/mnt/mount-location");
+ setup_env_gen(expected);
+
expected.add("CHROOT_SESSION_CLONE", "true");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
@@ -148,13 +152,10 @@ public:
void test_setup_env_session()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "directory");
+ setup_env_gen(expected);
+
expected.add("CHROOT_NAME", "test-union-session-name");
expected.add("CHROOT_DESCRIPTION", chroot->get_description() + ' ' + _("(session chroot)"));
- expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
- expected.add("CHROOT_DIRECTORY", "/srv/chroot/example-chroot");
- expected.add("CHROOT_PATH", "/mnt/mount-location");
expected.add("CHROOT_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "false");
expected.add("CHROOT_SESSION_PURGE", "true");
@@ -169,13 +170,10 @@ public:
void test_setup_env_source()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "directory");
+ setup_env_gen(expected);
+
expected.add("CHROOT_NAME", "test-name-source");
expected.add("CHROOT_DESCRIPTION", chroot->get_description() + ' ' + _("(source chroot)"));
- expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
- expected.add("CHROOT_DIRECTORY", "/srv/chroot/example-chroot");
- expected.add("CHROOT_PATH", "/mnt/mount-location");
expected.add("CHROOT_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
diff --git a/test/sbuild-chroot-loopback.cc b/test/sbuild-chroot-loopback.cc
index 62740c6..3525953 100644
--- a/test/sbuild-chroot-loopback.cc
+++ b/test/sbuild-chroot-loopback.cc
@@ -122,9 +122,8 @@ public:
CPPUNIT_ASSERT(pmnt->get_mount_options() == "-o opt1,opt2");
}
- void test_setup_env()
+ void setup_env_gen(sbuild::environment& expected)
{
- sbuild::environment expected;
setup_env_chroot(expected);
expected.add("CHROOT_TYPE", "loopback");
expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
@@ -133,6 +132,13 @@ public:
expected.add("CHROOT_FILE", loopback_file);
expected.add("CHROOT_MOUNT_DEVICE", loopback_file);
expected.add("CHROOT_MOUNT_OPTIONS", "-t jfs -o quota,rw");
+ }
+
+ void test_setup_env()
+ {
+ sbuild::environment expected;
+ setup_env_gen(expected);
+
expected.add("CHROOT_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
@@ -147,14 +153,8 @@ public:
void test_setup_env_fsunion()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "loopback");
- expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
- expected.add("CHROOT_LOCATION", "/squeeze");
- expected.add("CHROOT_PATH", "/mnt/mount-location/squeeze");
- expected.add("CHROOT_FILE", loopback_file);
- expected.add("CHROOT_MOUNT_DEVICE", loopback_file);
- expected.add("CHROOT_MOUNT_OPTIONS", "-t jfs -o quota,rw");
+ setup_env_gen(expected);
+
expected.add("CHROOT_SESSION_CLONE", "true");
expected.add("CHROOT_SESSION_CREATE", "true");
expected.add("CHROOT_SESSION_PURGE", "false");
@@ -169,16 +169,10 @@ public:
void test_setup_env_session()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "loopback");
+ setup_env_gen(expected);
+
expected.add("CHROOT_NAME", "test-union-session-name");
expected.add("CHROOT_DESCRIPTION", chroot->get_description() + ' ' + _("(session chroot)"));
- expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
- expected.add("CHROOT_LOCATION", "/squeeze");
- expected.add("CHROOT_PATH", "/mnt/mount-location/squeeze");
- expected.add("CHROOT_FILE", loopback_file);
- expected.add("CHROOT_MOUNT_DEVICE", loopback_file);
- expected.add("CHROOT_MOUNT_OPTIONS", "-t jfs -o quota,rw");
expected.add("CHROOT_SESSION_CLONE", "false");
expected.add("CHROOT_SESSION_CREATE", "false");
expected.add("CHROOT_SESSION_PURGE", "true");
@@ -193,16 +187,10 @@ public:
void test_setup_env_source()
{
sbuild::environment expected;
- setup_env_chroot(expected);
- expected.add("CHROOT_TYPE", "loopback");
+ setup_env_gen(expected);
+
expected.add("CHROOT_NAME", "test-name-source");
expected.add("CHROOT_DESCRIPTION", chroot->get_description() + ' ' + _("(source chroot)"));
- expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
- expected.add("CHROOT_LOCATION", "/squeeze");
- expected.add("CHROOT_PATH", "/mnt/mount-location/squeeze");
- expected.add("CHROOT_FILE", loopback_file);
- expected.add("CHROOT_MOUNT_DEVICE", loopback_file);
- 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");
--
1.6.3.2
More information about the Buildd-tools-devel
mailing list