spec/unit/plugins/solaris2/filesystem.rb in ohai-14.15.0 vs spec/unit/plugins/solaris2/filesystem.rb in ohai-15.0.35
- old
+ new
@@ -13,11 +13,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
-require_relative "../../../spec_helper"
+require_relative "spec_helper"
describe Ohai::System, "Solaris2.X filesystem plugin" do
let(:plugin) { get_plugin("filesystem") }
before(:each) do
@@ -58,11 +58,11 @@
rpool/export/home/phild 730451045 38 727373448 1% /export/home/phild
r
-hosts 0 0 0 0% /net
auto_home 0 0 0 0% /home
-fedfs 0 0 0 0% /nfs4
-DF_PKA
+ DF_PKA
@mount = <<~MOUNT
/ on rpool/ROOT/solaris-0 read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/mountpoint=/zones/servername.chef.internal.dns/root//zone=servername.chef.internal.dns/nozonemod/sharezone=151/dev=4bd0b7e on Fri Feb 2 16:27:36 2018
/var on rpool/ROOT/solaris-0/var read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/mountpoint=/zones/servername.chef.internal.dns/root/var/zone=servername.chef.internal.dns/nozonemod/sharezone=151/dev=4bd0b7f on Fri Feb 2 16:27:36 2018
/dev on /dev read/write/setuid/devices/rstchown/zone=servername.chef.internal.dns/nozonemod/sharezone=151/dev=8f8003a on Fri Feb 2 16:27:36 2018
@@ -80,11 +80,11 @@
/rpool on rpool read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b83 on Fri Feb 2 16:28:11 2018
/var/share/pkg on rpool/VARSHARE/pkg read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b84 on Fri Feb 2 16:28:12 2018
/var/share/pkg/repositories on rpool/VARSHARE/pkg/repositories read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b85 on Fri Feb 2 16:28:12 2018
/export/home/<usernameredacted> on rpool/export/home/<usernameredacted> read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b8a on Fri Feb 2 16:39:15 2018
/export/home/<usernameredacted> on rpool/export/home/<usernameredacted> read/write/setuid/nodevices/rstchown/nonbmand/exec/xattr/atime/zone=servername.chef.internal.dns/sharezone=151/dev=4bd0b8b on Fri Feb 2 16:39:16 2018
-MOUNT
+ MOUNT
@zfs_get = <<~ZFS_GET
data0 type filesystem -
data0 creation 1331514391 -
data0 used 7926803118480 -
@@ -321,10 +321,10 @@
data0/Movies defcontext none default
data0/Movies rootcontext none default
data0/Movies relatime off default
data0/Movies redundant_metadata all default
data0/Movies overlay off default:
-ZFS_GET
+ ZFS_GET
end
after(:each) do
Ohai.config[:plugin] = @original_plugin_config
end