From 2db5e0265dccafd2e57cd0956d3007e9181e0776 Mon Sep 17 00:00:00 2001
From: Joe Thornber <ejt@redhat.com>
Date: Wed, 8 Jan 2014 20:39:46 +0000
Subject: [PATCH] [cache_check features] rename a step

---
 features/cache_check.feature             |  7 ++++---
 features/step_definitions/cache_steps.rb | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/features/cache_check.feature b/features/cache_check.feature
index 74fb0ba..a47274c 100644
--- a/features/cache_check.feature
+++ b/features/cache_check.feature
@@ -13,19 +13,19 @@ Feature: cache_check
     When I run `cache_check --help`
 
     Then it should pass
-    And usage to stdout
+    And cache_usage to stdout
 
   Scenario: print help
     When I run `cache_check -h`
 
     Then it should pass
-    And usage to stdout
+    And cache_usage to stdout
 
   Scenario: Metadata file must be specified
     When I run `cache_check`
 
     Then it should fail
-    And usage to stderr
+    And cache_usage to stderr
     And the stderr should contain:
 
     """
@@ -52,6 +52,7 @@ Feature: cache_check
     foo: Not a block device or regular file
     """
 
+  # This test will fail if you're running as root
   Scenario: Metadata file exists, but can't be opened
     Given input without read permissions
     When I run `cache_check input`
diff --git a/features/step_definitions/cache_steps.rb b/features/step_definitions/cache_steps.rb
index 58217f4..81d6194 100644
--- a/features/step_definitions/cache_steps.rb
+++ b/features/step_definitions/cache_steps.rb
@@ -34,7 +34,7 @@ Then /^it should fail$/ do
   assert_success(false)
 end
 
-USAGE =<<EOF
+CACHE_USAGE =<<EOF
 Usage: cache_check [options] {device|file}
 Options:
   {-q|--quiet}
@@ -45,12 +45,12 @@ Options:
   {--skip-hints}
 EOF
 
-Then /^usage to stdout$/ do
-  assert_partial_output(USAGE, all_stdout)
+Then /^cache_usage to stdout$/ do
+  assert_partial_output(CACHE_USAGE, all_stdout)
 end
 
-Then /^usage to stderr$/ do
-  assert_partial_output(USAGE, all_stderr)
+Then /^cache_usage to stderr$/ do
+  assert_partial_output(CACHE_USAGE, all_stderr)
 end
 
 When(/^I run cache_check with (.*?)$/) do |opts|