Revert "vstart_runner.py: add methods for negative testing a cmd"

This reverts commit 48e0e1d7030bc4167bd3151696106a51f143bdba.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 0911452e5316d9bb10da7e5df1e0330d03bbe8b7..3511515fda5be233a95a8a6e5426efc43934c67b 100644 (file)
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -233,45 +233,15 @@ class CephFSMount(object):
                                       stdout=BytesIO(), stderr=BytesIO(),
                                       check_status=check_status, cwd=cwd)
 
-    def _verify(self, proc, retval=None, errmsg=None):
-        if retval:
-            msg = ('expected return value: {}\nreceived return value: '
-                   '{}\n'.format(retval, proc.returncode))
-            assert proc.returncode == retval, msg
-
-        if errmsg:
-            stderr = proc.stderr.getvalue().lower()
-            msg = ('didn\'t find given string in stderr -\nexpected string: '
-                   '{}\nreceived error message: {}\nnote: received error '
-                   'message is converted to lowercase'.format(errmsg, stderr))
-            assert errmsg in stderr, msg
-
-    def negtestcmd(self, args, retval=None, errmsg=None, stdin=None,
-                   cwd=None, wait=True):
-        """
-        Conduct a negative test for the given command.
-
-        retval and errmsg are parameters to confirm the cause of command
-        failure.
-        """
-        proc = self.run_shell(args=args, wait=wait, stdin=stdin, cwd=cwd,
-                              check_status=False)
-        self._verify(proc, retval, errmsg)
-        return proc
-
-    def negtestcmd_as_user(self, args, user, retval=None, errmsg=None,
-                           stdin=None, cwd=None, wait=True):
-        proc = self.run_as_user(args=args, user=user, wait=wait, stdin=stdin,
-                                cwd=cwd, check_status=False)
-        self._verify(proc, retval, errmsg)
-        return proc
-
-    def negtestcmd_as_root(self, args, retval=None, errmsg=None, stdin=None,
-                           cwd=None, wait=True):
-        proc = self.run_as_root(args=args, wait=wait, stdin=stdin, cwd=cwd,
-                                check_status=False)
-        self._verify(proc, retval, errmsg)
-        return proc
+    def testcmd(self, args, wait=True, stdin=None, cwd=None, omit_sudo=True):
+        return self.run_shell(args=args, wait=wait, stdin=stdin, cwd=cwd)
+
+    def testcmd_as_user(self, args, user, wait=True, stdin=None, cwd=None):
+        return self.run_as_user(args=args, user=user, wait=wait, stdin=stdin,
+                                cwd=cwd)
+
+    def testcmd_as_root(self, args, wait=True, stdin=None, cwd=None):
+        return self.run_as_root(args=args, wait=wait, stdin=stdin, cwd=cwd)
 
     def open_no_data(self, basename):
         """