Skip to content

qa/cephfs: allow checking for multiple error messages while...#46993

Merged
rishabh-d-dave merged 1 commit intoceph:mainfrom
rishabh-d-dave:qa-caps-helper-multiple-errmsgs
Jul 20, 2022
Merged

qa/cephfs: allow checking for multiple error messages while...#46993
rishabh-d-dave merged 1 commit intoceph:mainfrom
rishabh-d-dave:qa-caps-helper-multiple-errmsgs

Conversation

@rishabh-d-dave
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave commented Jul 6, 2022 •
edited
Loading

while negative testing.

Related PR - PR #41779. Commits on this PR originally were located on PR #41779. These have been moved to a separate PR for ease of review, testing, merging and, more importantly to get these commits merged sooner so that this code can be reused to write other PRs.

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
    • improvement in QA
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@rishabh-d-dave rishabh-d-dave requested review from a team and vshankar July 6, 2022 11:49
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 6, 2022

jenkins test make check

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 6, 2022

jenkins test make check arm64

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 6, 2022

jenkins test api

@rishabh-d-dave rishabh-d-dave mentioned this pull request Jul 6, 2022
Merged
4 tasks
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 6, 2022

jenkins test api

1 similar comment
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 7, 2022

jenkins test api

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 7, 2022

https://jenkins.ceph.com/job/ceph-api/40158/

vshankar
vshankar reviewed Jul 8, 2022
View reviewed changes
@rishabh-d-dave rishabh-d-dave force-pushed the qa-caps-helper-multiple-errmsgs branch from 08288b6 to d703fb2 Compare July 8, 2022 07:34
@rishabh-d-dave rishabh-d-dave requested a review from vshankar July 8, 2022 07:34
@rishabh-d-dave rishabh-d-dave mentioned this pull request Jul 8, 2022
Merged
15 tasks
vshankar
vshankar reviewed Jul 8, 2022
View reviewed changes
Copy link
Contributor

@vshankar vshankar left a comment

Choose a reason for hiding this comment

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

Looks fine - please run this through fs suite.

@rishabh-d-dave rishabh-d-dave added the wip-rishabh-testing Rishabh's testing label label Jul 8, 2022
vshankar
vshankar approved these changes Jul 13, 2022
View reviewed changes
Copy link
Contributor

@vshankar vshankar left a comment

Choose a reason for hiding this comment

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

@rishabh-d-dave please run this through fs suite.

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 14, 2022

It was already a part of last one. The run mostly went fine. Looking forward to discuss the QA run before posting results.

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 20, 2022 •
edited
Loading

QA was successful - https://tracker.ceph.com/projects/cephfs/wiki/Main#2022-Jul-15.

@rishabh-d-dave
qa/cephfs: allow checking for multiple error messages while...
82b58e3 
while negative testing.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave rishabh-d-dave force-pushed the qa-caps-helper-multiple-errmsgs branch from d703fb2 to 82b58e3 Compare July 20, 2022 07:42
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 20, 2022

Last PR branch update was to resolve the conflict during rebase. The conflict was between this PR and PR #46991. Here's the change that was made for conflict resolution -
https://github.com/ceph/ceph/compare/d703fb275c3ebfa42eb7063084e6b191b4c6d7f9..82b58e366718d95859ae2e98f24fc2a557efc0e6#diff-9998476d9d02f4136e9f6b4b512be93a77a5911a30027bec6a120706a1a024f3

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 20, 2022

The QA run had both of these PRs as well as changes required for resolving conflict.

diff --cc qa/tasks/cephfs/caps_helper.py
index 249cbec361f,ddfff9bc11f..48eae3bdab9
--- a/qa/tasks/cephfs/caps_helper.py
+++ b/qa/tasks/cephfs/caps_helper.py
@@@ -66,8 -67,7 +67,8 @@@ class CapsHelper(CephFSTestCase)
                  if path.find(mount.hostfs_mntpt) != -1:
                      cmdargs.append(path)
                      mount.negtestcmd(args=cmdargs, retval=1,
-                                      errmsg='permission denied')
+                                      errmsgs=possible_errmsgs)
 +                    cmdargs.pop(-1)

I'll merge this PR when the CI is green.

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 20, 2022

jenkins test api

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Jul 20, 2022

QA was successful - https://tracker.ceph.com/projects/cephfs/wiki/Main#2022-Jul-15.

@rishabh-d-dave rishabh-d-dave merged commit 4c7c721 into ceph:main Jul 20, 2022
@rishabh-d-dave rishabh-d-dave deleted the qa-caps-helper-multiple-errmsgs branch July 20, 2022 11:45
@rishabh-d-dave rishabh-d-dave mentioned this pull request Dec 18, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vshankar vshankar vshankar approved these changes

Assignees

No one assigned

Labels

cephfs Ceph File System tests wip-rishabh-testing Rishabh's testing label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rishabh-d-dave @vshankar