sbuild: Move chroot-block-device and chroot-lvm-snapshot to namespace chroot

2 files changed, 12 insertions, 12 deletions

diff --git a/test/sbuild/chroot-block-device.cc b/test/sbuild/chroot-block-device.cc
index c37444ac..8c158c9a 100644
--- a/test/sbuild/chroot-block-device.cc
+++ b/test/sbuild/chroot-block-device.cc
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <set>
 
-#include <sbuild/chroot-block-device.h>
+#include <sbuild/chroot/block-device.h>
 #include <sbuild/chroot-facet-mountable.h>
 #include <sbuild/i18n.h>
 #include <sbuild/keyfile-writer.h>
@@ -34,11 +34,11 @@ using namespace CppUnit;
 
 using sbuild::_;
 
-class chroot_block_device : public sbuild::chroot_block_device
+class chroot_block_device : public sbuild::chroot::block_device
 {
 public:
   chroot_block_device():
-    sbuild::chroot_block_device()
+    sbuild::chroot::block_device()
   {}
 
   virtual ~chroot_block_device()
@@ -95,7 +95,7 @@ public:
   {
     test_chroot_base<chroot_block_device>::setup_chroot_props(chroot);
 
-    std::shared_ptr<sbuild::chroot_block_device> c = std::dynamic_pointer_cast<sbuild::chroot_block_device>(chroot);
+    std::shared_ptr<sbuild::chroot::block_device> c = std::dynamic_pointer_cast<sbuild::chroot::block_device>(chroot);
 
     c->set_device("/dev/testdev");
 
@@ -109,7 +109,7 @@ public:
   void
   test_device()
   {
-    std::shared_ptr<sbuild::chroot_block_device> c = std::dynamic_pointer_cast<sbuild::chroot_block_device>(chroot);
+    std::shared_ptr<sbuild::chroot::block_device> c = std::dynamic_pointer_cast<sbuild::chroot::block_device>(chroot);
     CPPUNIT_ASSERT(c);
     c->set_device("/dev/some/device");
     CPPUNIT_ASSERT(c->get_device() == "/dev/some/device");
diff --git a/test/sbuild/chroot-lvm-snapshot.cc b/test/sbuild/chroot-lvm-snapshot.cc
index 9dec30f2..2bab5491 100644
--- a/test/sbuild/chroot-lvm-snapshot.cc
+++ b/test/sbuild/chroot-lvm-snapshot.cc
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#include <sbuild/chroot-lvm-snapshot.h>
+#include <sbuild/chroot/lvm-snapshot.h>
 #include <sbuild/chroot-facet-mountable.h>
 #include <sbuild/i18n.h>
 #include <sbuild/keyfile-writer.h>
@@ -35,11 +35,11 @@ using namespace CppUnit;
 
 using sbuild::_;
 
-class chroot_lvm_snapshot : public sbuild::chroot_lvm_snapshot
+class chroot_lvm_snapshot : public sbuild::chroot::lvm_snapshot
 {
 public:
   chroot_lvm_snapshot():
-    sbuild::chroot_lvm_snapshot()
+    sbuild::chroot::lvm_snapshot()
   {}
 
   virtual ~chroot_lvm_snapshot()
@@ -84,7 +84,7 @@ public:
   {
     test_chroot_base<chroot_lvm_snapshot>::setup_chroot_props(chroot);
 
-    std::shared_ptr<sbuild::chroot_lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot_lvm_snapshot>(chroot);
+    std::shared_ptr<sbuild::chroot::lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot::lvm_snapshot>(chroot);
 
     c->set_device("/dev/volgroup/testdev");
     c->set_snapshot_options("--size 1G");
@@ -100,7 +100,7 @@ public:
   void
   test_snapshot_device()
   {
-    std::shared_ptr<sbuild::chroot_lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot_lvm_snapshot>(chroot);
+    std::shared_ptr<sbuild::chroot::lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot::lvm_snapshot>(chroot);
     CPPUNIT_ASSERT(c);
     c->set_snapshot_device("/dev/volgroup/some/snapshot/device");
     CPPUNIT_ASSERT(c->get_snapshot_device() == "/dev/volgroup/some/snapshot/device");
@@ -109,7 +109,7 @@ public:
   void
   test_snapshot_options()
   {
-    std::shared_ptr<sbuild::chroot_lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot_lvm_snapshot>(chroot);
+    std::shared_ptr<sbuild::chroot::lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot::lvm_snapshot>(chroot);
     CPPUNIT_ASSERT(c);
     c->set_snapshot_options("-o opt1,opt2");
     CPPUNIT_ASSERT(c->get_snapshot_options() == "-o opt1,opt2");
@@ -145,7 +145,7 @@ public:
 
   void test_setup_env_session()
   {
-    std::shared_ptr<sbuild::chroot_lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot_lvm_snapshot>(chroot);
+    std::shared_ptr<sbuild::chroot::lvm_snapshot> c = std::dynamic_pointer_cast<sbuild::chroot::lvm_snapshot>(chroot);
 
     sbuild::environment expected;
     setup_env_gen(expected);