Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qa/tasks: make sh() in vstart_runner.py identical with teuthology.orchestra.remote.sh #35639

Merged
merged 1 commit into from Jul 2, 2020

Conversation

joscollin
Copy link
Member

@joscollin joscollin commented Jun 18, 2020

@joscollin joscollin requested a review from kshtsk June 18, 2020 08:55
@@ -422,7 +422,7 @@ def _do_run(self, args, check_status=True, wait=True, stdout=None,

return proc

# XXX: for compatibility keep this method same teuthology.orchestra.remote.sh
# XXX: for compatibility keep this method same as in teuthology.orchestra.remote.py
Copy link
Contributor

@kshtsk kshtsk Jun 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is incorrect, you use either teuthology.orchestra.remote.sh or teuthology/orchestra/remote.py, but in the latter case you need to put reference to teuthology repo since you are in ceph repo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, I just misinterpreted .sh as file extension. Fixed.

@joscollin joscollin force-pushed the wip-fix-sh-as-in-teuthology branch 2 times, most recently from ce166a9 to a53fa39 Compare June 18, 2020 09:10
@batrick batrick added cephfs Ceph File System needs-review labels Jun 18, 2020
@joscollin joscollin requested a review from kshtsk June 19, 2020 01:18
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR perhaps needs a rebase, I see import BytesIO on PR branch but not on master.

…hestra.remote.sh

Fixes: https://tracker.ceph.com/issues/46069
Signed-off-by: Jos Collin <jcollin@redhat.com>
@joscollin joscollin force-pushed the wip-fix-sh-as-in-teuthology branch from a53fa39 to 63a9ddc Compare July 1, 2020 12:20
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested the PR -

2020-07-01 17:53:30,179.179 INFO:__main__:Stopped test: test_issue_cephfs_shell_cmd_at_invocation (tasks.cephfs.test_cephfs_shell.TestMisc) in 16.592094s
2020-07-01 17:53:30,179.179 INFO:__main__:
2020-07-01 17:53:30,179.179 INFO:__main__:----------------------------------------------------------------------
2020-07-01 17:53:30,179.179 INFO:__main__:Ran 1 test in 16.592s
2020-07-01 17:53:30,179.179 INFO:__main__:
2020-07-01 17:53:30,180.180 INFO:__main__:OK

From test_issue_cephfs_shell_cmd_at_invocation -

class TestMisc(TestCephFSShell):
    def test_issue_cephfs_shell_cmd_at_invocation(self):
        """
        Test that `cephfs-shell -c conf cmd` works.
        """
        # choosing a long name since short ones have a higher probability
        # of getting matched by coincidence.
        dirname = 'somedirectory'
        self.run_cephfs_shell_cmd(['mkdir', dirname])

        output = self.mount_a.client_remote.sh(['cephfs-shell', 'ls']).\
            strip()

@joscollin
Copy link
Member Author

Jenkins retest this please

@joscollin
Copy link
Member Author

retest this please

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-fix cephfs Ceph File System
Projects
None yet
4 participants