summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Dibowitz <phild@fb.com>2015-06-24 10:11:30 -0700
committerPhil Dibowitz <phild@fb.com>2015-06-24 10:11:30 -0700
commit6d4c45db85a8ea613c6544ff6278bc89d95cfbcf (patch)
tree00c925d56696793bade1830eeccd8927a95788ab
parent27efdab791d59d239007f1dea9cbd4a75c27dfda (diff)
downloadohai-6d4c45db85a8ea613c6544ff6278bc89d95cfbcf.tar.gz
Review changes.
-rw-r--r--lib/ohai/plugins/darwin/filesystem2.rb4
-rw-r--r--spec/unit/plugins/darwin/filesystem2_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ohai/plugins/darwin/filesystem2.rb b/lib/ohai/plugins/darwin/filesystem2.rb
index 040e8c4d..fe36ae3e 100644
--- a/lib/ohai/plugins/darwin/filesystem2.rb
+++ b/lib/ohai/plugins/darwin/filesystem2.rb
@@ -1,6 +1,8 @@
#
+# Author:: Phil Dibowitz (<phil@ipom.com>)
# Author:: Benjamin Black (<bb@opscode.com>)
# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Copyright:: Copyright (c) 2015 Facebook, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,8 +52,6 @@ Ohai.plugin(:Filesystem2) do
collect_data(:darwin) do
fs = Mash.new
-
-
block_size = 0
# on new versions of OSX, -i is default, on old versions it's not, so
# specifying it gets consistent output
diff --git a/spec/unit/plugins/darwin/filesystem2_spec.rb b/spec/unit/plugins/darwin/filesystem2_spec.rb
index 85e44de1..4e24bbc7 100644
--- a/spec/unit/plugins/darwin/filesystem2_spec.rb
+++ b/spec/unit/plugins/darwin/filesystem2_spec.rb
@@ -20,7 +20,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
describe Ohai::System, "darwin filesystem2 plugin" do
before(:each) do
- @plugin = get_plugin("darwin/filesystem2")
+ let(:plugin) { get_plugin("darwin/filesystem2") }
allow(@plugin).to receive(:collect_os).and_return(:darwin)
allow(@plugin).to receive(:shell_out).with("df -i").and_return(mock_shell_out(0, "", ""))