Merge pull request #2065 from puppetlabs/FACT-2781

(FACT-2781) Fix filesystems on osx
puppetlabs · Sep 7, 2020 · 4d0541a · 4d0541a
2 parents 7362072 + b559238
commit 4d0541a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/lib/facter/resolvers/macosx/filesystems_resolver.rb b/lib/facter/resolvers/macosx/filesystems_resolver.rb
@@ -17,11 +17,7 @@ def post_resolve(fact_name)
 
           def read_filesystems(fact_name)
             output = Facter::Core::Execution.execute('mount', logger: log)
-            filesystems = []
-            output.each_line do |line|
-              filesystem = line.match(/\(([a-z]+)\,*/).to_s
-              filesystems << filesystem[1..-2]
-            end
+            filesystems = output.scan(/\(([a-z]+)\,*/).flatten
             @fact_list[:macosx_filesystems] = filesystems.uniq.sort.join(',')
             @fact_list[fact_name]
           end

diff --git a/spec/facter/resolvers/macosx/filesystems_resolver_spec.rb b/spec/facter/resolvers/macosx/filesystems_resolver_spec.rb
@@ -8,11 +8,11 @@
   before do
     filesystems_resolver.instance_variable_set(:@log, log_spy)
     allow(Facter::Core::Execution).to receive(:execute).with('mount', logger: log_spy)
-                                                       .and_return(load_fixture('macosx_filesystems'))
+                                                       .and_return(load_fixture('macosx_filesystems').read)
   end
 
   describe '#call_the_resolver' do
-    let(:filesystems) { 'apfs,autofs,devfs' }
+    let(:filesystems) { 'apfs,autofs,devfs,vmhgfs' }
 
     it 'returns systems' do
       expect(filesystems_resolver.resolve(:macosx_filesystems)).to eq(filesystems)

diff --git a/spec/fixtures/macosx_filesystems b/spec/fixtures/macosx_filesystems
@@ -1,5 +1,6 @@
-/dev/disk1s1 on / (apfs, local, journaled)
+/dev/disk1s5 on / (apfs, local, read-only, journaled)
 devfs on /dev (devfs, local, nobrowse)
-/dev/disk1s4 on /private/var/vm (apfs, local, noexec, journaled, noatime, nobrowse)
-map -hosts on /net (autofs, nosuid, automounted, nobrowse)
-map auto_home on /home (autofs, automounted, nobrowse)
+/dev/disk1s1 on /System/Volumes/Data (apfs, local, journaled, nobrowse)
+/dev/disk1s4 on /private/var/vm (apfs, local, journaled, nobrowse)
+map auto_home on /System/Volumes/Data/home (autofs, automounted, nobrowse)
+.host:/VMware Shared Folders on /Volumes/VMware Shared Folders (vmhgfs)