Skip to content

(FACT-2783) Updated how osx mountpoints are calculated #2072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BogdanIrimie merged 1 commit into from
Sep 8, 2020
Merged

(FACT-2783) Updated how osx mountpoints are calculated #2072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/facter/resolvers/macosx/mountpoints_resolver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def post_resolve(fact_name)

def read_mounts
mounts = {}

FilesystemHelper.read_mountpoints.each do |fs|
device = fs.name
filesystem = fs.mount_type
Expand All @@ -36,8 +37,8 @@ def read_stats(path)
begin
stats = FilesystemHelper.read_mountpoint_stats(path)
size_bytes = stats.bytes_total
used_bytes = stats.bytes_used
available_bytes = size_bytes - used_bytes
available_bytes = stats.bytes_available
used_bytes = size_bytes - available_bytes
rescue Sys::Filesystem::Error
size_bytes = used_bytes = available_bytes = 0
end
Expand Down
10 changes: 5 additions & 5 deletions spec/facter/resolvers/macosx/mountpoints_resolver_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ class Error < StandardError
end

let(:fact) do
{ '/proc/a' => { available: '85.44 GiB',
available_bytes: 91_745_386_496,
capacity: '80.33%',
{ '/proc/a' => { available: '63.31 GiB',
available_bytes: 67_979_685_888,
capacity: '85.43%',
device: '/dev/nvme0n1p2',
filesystem: 'ext4',
options: ['rw'],
size: '434.42 GiB',
size_bytes: 466_449_743_872,
used: '348.97 GiB',
used_bytes: 374_704_357_376 } }
used: '371.10 GiB',
used_bytes: 398_470_057_984 } }
end

before do
Expand Down
⚡