Skip to content

Fix storpool test & remove powermock - #7652

Merged
yadvr merged 1 commit into
apache:mainfrom
shapeblue:fix-storpool-tests
Jun 27, 2023
Merged

yadvr merged 1 commit into
apache:mainfrom
shapeblue:fix-storpool-tests

Conversation

@vishesh92

Copy link
Copy Markdown
Member

Description

This PR fixes unit tests for plugins/storage/volume/storpool/ and removes powermock.

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?

@codecov

codecov Bot commented Jun 19, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7652 (6128822) into main (27b0a64) will increase coverage by 0.04%.
The diff coverage is 50.00%.

@@             Coverage Diff              @@
##               main    #7652      +/-   ##
============================================
+ Coverage     13.12%   13.16%   +0.04%     
- Complexity     9143     9166      +23     
============================================
  Files          2728     2728              
  Lines        256997   257000       +3     
  Branches      40067    40068       +1     
============================================
+ Hits          33729    33844     +115     
+ Misses       219021   218887     -134     
- Partials       4247     4269      +22     
Impacted Files Coverage Δ
...loudstack/storage/datastore/util/StorPoolUtil.java 8.38% <50.00%> (+8.38%) ⬆️

... and 6 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 6270

@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

@vishesh92
vishesh92 marked this pull request as draft June 20, 2023 06:03
@vishesh92
vishesh92 requested a review from slavkap June 20, 2023 06:13
@vishesh92
vishesh92 marked this pull request as ready for review June 20, 2023 06:15
@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-6770)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 40479 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7652-t6770-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

@vishesh92

Copy link
Copy Markdown
Member Author

@slavkap Can you review this?

One minor change in StorPoolUtil.java which checks if /var/log/cloudstack/management/ directory exists or not and depending on that selects the path of the log file. Tests were failing if /var/log/cloudstack/management/ was not present on the filesystem.

@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

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

slavkap commented Jun 23, 2023

Copy link
Copy Markdown
Contributor

Thanks, @vishesh92, the code LGTM

@DaanHoogland

Copy link
Copy Markdown
Contributor

@slavkap Do you need to test this, as StorePoolUtil cahnged?

@yadvr

yadvr commented Jun 27, 2023

Copy link
Copy Markdown
Member

Merging based on @slavkap 's and others review, build and smoketests.

@yadvr
yadvr merged commit c3718ab into apache:main Jun 27, 2023
@yadvr
yadvr deleted the fix-storpool-tests branch June 27, 2023 09:25
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.

6 participants