Create /sys/block symlink for block devices

Other part of
#41

Author: martinpitt

NEWS

@@ -3,6 +3,7 @@
 - Fix compilation on sparc with gcc 4.9.
 - Support attributes with leading directory names, such as "queue/rotational".
   (issue #41)
+- Create /sys/block symlink for block devices (other part of issue #41).
 
 0.8.5 (2014-07-11)
 ------------------

src/umockdev.vala

@@ -412,6 +412,15 @@ public class Testbed: GLib.Object {
         assert(FileUtils.symlink(Path.build_filename("..", "..", dev_path_no_sys),
                                  Path.build_filename(class_dir, Path.get_basename(name))) == 0);
 
+        /* /sys/block symlink */
+        if (subsystem == "block") {
+            var block_dir = Path.build_filename(this.sys_dir, "block");
+            if (DirUtils.create_with_parents(block_dir, 0755) != 0)
+                error("cannot create block dir '%s': %s", block_dir, strerror(errno));
+            assert (FileUtils.symlink(Path.build_filename("..", dev_path_no_sys),
+                                     Path.build_filename(block_dir, Path.get_basename(name))) == 0);
+        }
+
         /* bus symlink */
         if (subsystem == "usb" || subsystem == "pci") {
             class_dir = Path.build_filename(this.sys_dir, "bus", subsystem, "devices");

tests/test-umockdev.c

@@ -339,6 +339,35 @@ t_testbed_child_device(UMockdevTestbedFixture * fixture, gconstpointer data)
     g_free(input);
 }
 
+/* UMockdevTestbed add_device() with adding a block device */
+static void
+t_testbed_add_block_device(UMockdevTestbedFixture * fixture, gconstpointer data)
+{
+    gchar *syspath;
+
+    syspath = umockdev_testbed_add_device(fixture->testbed, "block", "scribble", NULL,
+					  /* attributes */
+					  "size", "10000", NULL,
+					  /* properties */
+					  "ID_TYPE", "disk", NULL);
+    g_assert(syspath);
+    g_assert_cmpstr(syspath, ==, "/sys/devices/scribble");
+
+    /* check attributes */
+    g_assert(g_file_test("/sys/devices/scribble/size", G_FILE_TEST_IS_REGULAR));
+    g_assert(g_file_test("/sys/devices/scribble/uevent", G_FILE_TEST_IS_REGULAR));
+    g_assert(g_file_test("/sys/devices/scribble/subsystem", G_FILE_TEST_IS_SYMLINK));
+
+    /* check class symlinks */
+    g_assert(g_file_test("/sys/class/block/scribble", G_FILE_TEST_IS_SYMLINK));
+    g_assert(g_file_test("/sys/class/block/scribble/size", G_FILE_TEST_IS_REGULAR));
+
+    g_assert(g_file_test("/sys/block/scribble", G_FILE_TEST_IS_SYMLINK));
+    g_assert(g_file_test("/sys/block/scribble/size", G_FILE_TEST_IS_REGULAR));
+
+    g_free(syspath);
+}
+
 struct TestbedErrorCatcherData {
     unsigned counter;
     GLogLevelFlags last_level;
@@ -1858,6 +1887,8 @@ main(int argc, char **argv)
 	       t_testbed_add_devicev, t_testbed_fixture_teardown);
     g_test_add("/umockdev-testbed/add_device", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup,
 	       t_testbed_add_device, t_testbed_fixture_teardown);
+    g_test_add("/umockdev-testbed/add_block_device", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup,
+	       t_testbed_add_block_device, t_testbed_fixture_teardown);
     g_test_add("/umockdev-testbed/add_device_errors", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup,
 	       t_testbed_add_device_errors, t_testbed_fixture_teardown);
     g_test_add("/umockdev-testbed/child_device", UMockdevTestbedFixture, NULL, t_testbed_fixture_setup,