From: Gregory Farnum <gfarnum@redhat.com>
Date: Mon, 27 Apr 2020 23:35:20 +0000 (-0700)
Subject: Merge pull request #34595 from rishabh-d-dave/fs-move-run_shell
X-Git-Tag: v16.1.0~2492
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a9612bcdefd15b2c012bca4467ac4459c58e08a;p=ceph.git

Merge pull request #34595 from rishabh-d-dave/fs-move-run_shell

qa/cephfs: move run_shell to mount.py and add methods for negative testing

Reviewed-by: Jeff Layton <jlayton@redhat.com>
---

0a9612bcdefd15b2c012bca4467ac4459c58e08a
diff --cc qa/tasks/vstart_runner.py
index 9e1c0def57cc,f19cd112aa5f..68745b6125f9
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@@ -530,10 -512,9 +530,9 @@@ def safe_kill(pid)
          else:
              raise
  
- 
  class LocalKernelMount(KernelMount):
 -    def __init__(self, ctx, test_dir, client_id):
 -        super(LocalKernelMount, self).__init__(ctx, test_dir, client_id, LocalRemote(), None, None, None)
 +    def __init__(self, ctx, test_dir, client_id, brxnet):
 +        super(LocalKernelMount, self).__init__(ctx, test_dir, client_id, LocalRemote(), brxnet)
  
      @property
      def config_path(self):