Fixes #118 Add nfs-utils

minishift · Jul 20, 2017 · 09d2bcb · 09d2bcb
1 parent 481e600
commit 09d2bcb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/centos-7.template b/centos-7.template
@@ -44,6 +44,7 @@ syslinux
 hyperv-daemons
 cifs-utils
 fuse-sshfs
+nfs-utils
 
 #Packages to be removed
 -aic94xx-firmware

diff --git a/rhel-7.template b/rhel-7.template
@@ -43,6 +43,7 @@ hyperv-daemons
 cifs-utils
 cdk-entitlements
 fuse-sshfs
+nfs-utils
 
 #Packages to be removed
 -aic94xx-firmware

diff --git a/tests/test.py b/tests/test.py
@@ -59,13 +59,18 @@ def test_docker_env_evaluable(self):
     def test_cifs_installed(self):
         cmd = self.bin_dir + "minishift ssh 'sudo /sbin/mount.cifs -V'"
         output = self.execute_test({ 'cmd': cmd })
-        self.assertEqual('mount.cifs version: 6.2', output.rstrip())
+        self.assertEqual(output.rstrip(), 'mount.cifs version: 6.2')
 
     def test_sshfs_installed(self):
         cmd = self.bin_dir + "minishift ssh 'sudo sshfs -V'"
         output = self.execute_test({ 'cmd': cmd })
         self.assertRegexpMatches(output.rstrip(), r'.*SSHFS version 2\.5.*')
 
+    def test_nfs_installed(self):
+        cmd = self.bin_dir + "minishift ssh 'sudo /sbin/mount.nfs -V'"
+        output = self.execute_test({ 'cmd': cmd })
+        self.assertEqual(output.rstrip(), 'mount.nfs: (linux nfs-utils 1.3.0)')
+
     def test_stopping_vm(self):
         ''' Test stopping machine '''
         cmd = self.bin_dir + "minishift stop"
@@ -81,7 +86,8 @@ def test_stopping_vm(self):
 
     def test_swapspace(self):
         ''' Test if swap space is available on restart '''
-        cmd = self.bin_dir + "minishift start"
+        start_args = (self.driver_name, "file://"  + self.iso_file)
+        cmd = self.bin_dir + "minishift start --vm-driver %s --iso-url %s" % start_args
         self.execute_test({ 'cmd': cmd })
 
         # Check swap space