tweaks to metadata constructor, and some updated features.

features/step_definitions/thin_steps.rb

@@ -1,6 +1,6 @@
 Given(/^valid metadata$/) do
   in_current_dir do
-    write_valid_xml(xml_file)
+    system("thinp_xml create --nr-thins uniform[4..9] --nr-mappings uniform[1000..10000] > #{xml_file}")
   end
 
   run_simple("dd if=/dev/zero of=#{dev_file} bs=4k count=1024")

features/support/world_extensions.rb

@@ -1,3 +1,7 @@
+Before do
+  @aruba_timeout_seconds = 10
+end
+
 module ThinpWorld
   def tools_version
     "0.1.5+"
@@ -21,8 +25,8 @@ module ThinpWorld
     File.open(path, "w+") do |f|
       f.write <<EOF
 <superblock uuid="" time="0" transaction="0" data_block_size="128" nr_data_blocks="1000">
-  <device dev_id="0" mapped_blocks="2" transaction="0" creation_time="0" snap_time="0">
-    <range_mapping origin_begin="0" data_begin="0" length="2" time="0"/>
+  <device dev_id="0" mapped_blocks="100" transaction="0" creation_time="0" snap_time="0">
+    <range_mapping origin_begin="25" data_begin="0" length="100" time="0"/>
   </device>
 </superblock>
 EOF

features/thin_rmap.feature

@@ -48,6 +48,7 @@ Feature: thin_rmap
     When I run `thin_rmap --unleash-the-hedeghogs`
     Then it should fail
 
+  @announce
   Scenario: Valid region format should pass
     Given valid metadata
     When I run thin_rmap with --region 23..7890