Support attributes with leading directory names

This is useful for mocking block devices, which have attributes like
"queue/rotational".

#41

Author: martinpitt

NEWS

@@ -1,6 +1,7 @@
 0.8.6 (UNRELEASED)
 ------------------
 - Fix compilation on sparc with gcc 4.9.
+- Support attributes with leading directory names, such as "queue/rotational".
 
 0.8.5 (2014-07-11)
 ------------------

src/umockdev.vala

@@ -143,16 +143,24 @@ public class Testbed: GLib.Object {
      * umockdev_testbed_set_attribute_binary:
      * @self: A #UMockdevTestbed.
      * @devpath: The full device path, as returned by #umockdev_testbed_add_device()
-     * @name: Attribute name
+     * @name: Attribute name (may contain leading directories like
+     *        "queue/rotational")
      * @value: Attribute binary value
      * @value_length1: Length of @value in bytes.
      *
      * Set a binary sysfs attribute for a device.
      */
     public void set_attribute_binary(string devpath, string name, uint8[] value)
     {
+        var attr_path = Path.build_filename(this.root_dir, devpath, name);
+        if ("/" in name) {
+            string d = Path.get_dirname(attr_path);
+            if (DirUtils.create_with_parents(d, 0755) != 0)
+                error("cannot create attribute subdir '%s': %s", d, strerror(errno));
+        }
+
         try {
-            FileUtils.set_data(Path.build_filename(this.root_dir, devpath, name), value);
+            FileUtils.set_data(attr_path, value);
         } catch (FileError e) {
             error("Cannot write attribute file: %s", e.message);
         }
@@ -162,7 +170,8 @@ public class Testbed: GLib.Object {
      * umockdev_testbed_set_attribute_int:
      * @self: A #UMockdevTestbed.
      * @devpath: The full device path, as returned by #umockdev_testbed_add_device()
-     * @name: Attribute name
+     * @name: Attribute name (may contain leading directories like
+     *        "queue/rotational")
      * @value: Attribute integer value
      *
      * Set an integer sysfs attribute for a device.

tests/test-umockdev.c

@@ -426,6 +426,8 @@ t_testbed_set_attribute(UMockdevTestbedFixture * fixture, gconstpointer data)
     /* int attributes */
     umockdev_testbed_set_attribute_int(fixture->testbed, syspath, "count", 1000);
     umockdev_testbed_set_attribute_hex(fixture->testbed, syspath, "addr", 0x1a01);
+    /* subdir attribute */
+    umockdev_testbed_set_attribute(fixture->testbed, syspath, "knobs/red", "off");
 
     device = g_udev_client_query_by_sysfs_path(client, syspath);
     g_assert(device);
@@ -434,6 +436,7 @@ t_testbed_set_attribute(UMockdevTestbedFixture * fixture, gconstpointer data)
     g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "color"), ==, "yellow");
     g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "count"), ==, "1000");
     g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "addr"), ==, "1a01");
+    g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "knobs/red"), ==, "off");
     g_assert_cmpstr(g_udev_device_get_driver(device), ==, "hub");
     g_object_unref(device);
 
@@ -744,6 +747,7 @@ t_testbed_add_from_string(UMockdevTestbedFixture * fixture, gconstpointer data)
 					       "H: binary_attr=41A9FF0005FF00\n"
 					       "A: multiline_attr=a\\\\b\\nc\\\\d\\nlast\n"
 					       "A: simple_attr=1\n"
+					       "A: knobs/red=off\n"
 					       "L: driver=../../foo", &error);
     g_assert_no_error(error);
     g_assert(success);
@@ -760,6 +764,7 @@ t_testbed_add_from_string(UMockdevTestbedFixture * fixture, gconstpointer data)
     g_assert(g_udev_device_get_parent(device) == NULL);
     g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "simple_attr"), ==, "1");
     g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "multiline_attr"), ==, "a\\b\nc\\d\nlast");
+    g_assert_cmpstr(g_udev_device_get_sysfs_attr(device, "knobs/red"), ==, "off");
     g_assert_cmpstr(g_udev_device_get_property(device, "SIMPLE_PROP"), ==, "1");
     g_assert_cmpstr(g_udev_device_get_driver(device), ==, "foo");
     g_object_unref(device);