Skip to content

Remove powermock from ldap & project-role-based plugin - #7658

Merged
yadvr merged 2 commits into
apache:mainfrom
shapeblue:ldap-project-acl-remove-powermock
Jun 27, 2023
Merged

yadvr merged 2 commits into
apache:mainfrom
shapeblue:ldap-project-acl-remove-powermock

Conversation

@vishesh92

@vishesh92 vishesh92 commented Jun 20, 2023

Copy link
Copy Markdown
Member

Description

This PR removes powermock from tests & fixes the path for tests of project-role-based plugin.

Pending powermock usage after this PR

 git grep -i "PowerMockito" | tr "/" " "| awk '{print $1, $2, $3, $4, $5}' | sort | uniq -c       
     76 api src test java org
     51 core src test java com
     37 engine schema src test java
     68 engine storage configdrive src test
      9 engine storage snapshot src test
      3 plugins database quota src test
    150 plugins hypervisors kvm src test
      3 plugins hypervisors vmware src test
     40 plugins hypervisors xenserver src test
      5 plugins integrations kubernetes-service src test
      2 plugins network-elements nicira-nvp src test
     96 plugins network-elements tungsten src test
      1 plugins storage volume storpool src
    194 server src test java com
      2 server src test java org
      4 services console-proxy server src test
      2 services secondary-storage server src test
      2 vmware-base src test java com

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@vishesh92
vishesh92 force-pushed the ldap-project-acl-remove-powermock branch from 0df72bc to cc46d5a Compare June 20, 2023 19:24
@codecov

codecov Bot commented Jun 20, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7658 (cc46d5a) into main (e26d49d) will increase coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #7658      +/-   ##
============================================
+ Coverage     13.13%   13.14%   +0.01%     
- Complexity     9147     9163      +16     
============================================
  Files          2728     2728              
  Lines        256997   256997              
  Branches      40067    40067              
============================================
+ Hits          33747    33788      +41     
+ Misses       219001   218954      -47     
- Partials       4249     4255       +6     

see 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@vishesh92

Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@vishesh92 a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 6281

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clgtm

@vishesh92

Copy link
Copy Markdown
Member Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@vishesh92 a [SF] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-6805)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 39075 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7658-t6805-kvm-centos7.zip
Smoke tests completed. 111 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File

@DaanHoogland DaanHoogland added this to the 4.19.0.0 milestone Jun 22, 2023
@DaanHoogland

Copy link
Copy Markdown
Contributor

@shwstppr please add an explanation for your approval

@DaanHoogland
DaanHoogland requested a review from shwstppr June 23, 2023 11:31

@yadvr yadvr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM didn't test it, but I think we can rely on automated tests

@yadvr

yadvr commented Jun 27, 2023

Copy link
Copy Markdown
Member

Merging this based on code review, build/pkging checks, simulator/Github actions and smoketests.

@yadvr
yadvr merged commit 908b3b7 into apache:main Jun 27, 2023
@yadvr

yadvr commented Jun 27, 2023

Copy link
Copy Markdown
Member

Thanks @vishesh92 feel to submit for other areas of codebase in subsequent PRs, thanks for your PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants