]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #34595 from rishabh-d-dave/fs-move-run_shell
authorGregory Farnum <gfarnum@redhat.com>
Mon, 27 Apr 2020 23:35:20 +0000 (16:35 -0700)
committerGitHub <noreply@github.com>
Mon, 27 Apr 2020 23:35:20 +0000 (16:35 -0700)
qa/cephfs: move run_shell to mount.py and add methods for negative testing

Reviewed-by: Jeff Layton <jlayton@redhat.com>
1  2 
qa/tasks/cephfs/mount.py
qa/tasks/vstart_runner.py

Simple merge
index 9e1c0def57cc86e9f5446a97c8e13c663a0faadb,f19cd112aa5f847f2dc5f75019c4c6d10c4fb367..68745b6125f994454e9a11cad5dff736d93305ec
@@@ -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):