Skip to content

libcloud: modularize systemtest#1609

Merged
BareosBot merged 6 commits intobareos:masterfrom
bruno-at-bareos:dev/bruno/master/libcloud-modularize-systemtest
Dec 12, 2023
Merged

libcloud: modularize systemtest#1609
BareosBot merged 6 commits intobareos:masterfrom
bruno-at-bareos:dev/bruno/master/libcloud-modularize-systemtest

Conversation

@bruno-at-bareos
Copy link
Contributor

@bruno-at-bareos bruno-at-bareos commented Nov 30, 2023

While using libcloud plugin, we may have not tested "empty dirs" restore.
This PR aims to re-add an empty dir in our systemtest by pushing an empty file with the same name as the dir.
We also applied boy-scout rule to split the testrunner to use separated local test-cleanup and test-setup actions

Additionally we add a comment how to detect CLOSE_WAIT connection in the droplet systemtest in case someone want to fix it.

Please check

  • Short description and the purpose of this PR is present above this paragraph
  • Your name is present in the AUTHORS file (optional)

If you have any questions or problems, please give a comment in the PR.

Helpful documentation and best practices

Checklist for the reviewer of the PR (will be processed by the Bareos team)

Make sure you check/merge the PR using devtools/pr-tool to have some simple automated checks run and a proper changelog record added.

General
  • Is the PR title usable as CHANGELOG entry?
  • Purpose of the PR is understood
  • Commit descriptions are understandable and well formatted
    Check backport line
    Required backport PRs have been created
Source code quality
  • Source code changes are understandable
  • Variable and function names are meaningful
  • Code comments are correct (logically and spelling)
  • Required documentation changes are present and part of the PR

Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

I added some notes.

@bruno-at-bareos bruno-at-bareos force-pushed the dev/bruno/master/libcloud-modularize-systemtest branch from abc63d4 to 6a0009c Compare December 6, 2023 08:31
@sebsura
Copy link
Contributor

sebsura commented Dec 6, 2023

Could you also update the CMakeLists.txt COMMENT text if the test is disabled ? I was very confused by it

  if(S3CMD
     AND MINIO
     AND PYMODULE_3_LIBCLOUD_FOUND
     AND (${Python3_VERSION_MAJOR} EQUAL 3)
     AND (${Python3_VERSION_MINOR} LESS 10)
  )
    create_systemtest(${SYSTEMTEST_PREFIX} "py3plug-fd-libcloud")
  else()
    create_systemtest(
      ${SYSTEMTEST_PREFIX} "py3plug-fd-libcloud" DISABLED COMMENT
      "S3CMD, MINIO or LIBCLOUD MODULE not found or Python > 3.7"
    )

Should be or Python >= 3.10

EDIT: seems like this should instead check for python <3.8 and the comment should say >= 3.8

@bruno-at-bareos bruno-at-bareos force-pushed the dev/bruno/master/libcloud-modularize-systemtest branch from 5500f57 to 04bab4c Compare December 7, 2023 10:16
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Looks great.

Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Found a mostly cosmetic issue

@bruno-at-bareos bruno-at-bareos force-pushed the dev/bruno/master/libcloud-modularize-systemtest branch 2 times, most recently from e876c41 to 1fd028b Compare December 11, 2023 14:18
Copy link
Contributor

@sebsura sebsura left a comment

Choose a reason for hiding this comment

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

Those are very welcome changes. I noticed a few small issues that id like to see addressed.

@sebsura
Copy link
Contributor

sebsura commented Dec 12, 2023

This probably does not need to be backported to 23 right ?

@bruno-at-bareos bruno-at-bareos force-pushed the dev/bruno/master/libcloud-modularize-systemtest branch from f580f1a to 86cc4a8 Compare December 12, 2023 11:00
@bruno-at-bareos
Copy link
Contributor Author

And yes no need to backport.

bruno-at-bareos and others added 6 commits December 12, 2023 14:40
- cmake adjust python version to less than 3.8
  make the comment less confusing
- split testrunner to local test-cleanup and test-setup
- add the import of empty dir to cover the case by uploading an
  empty file with same name as dir
- improve comments, remove obsolete parts

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
Co-authored-by: Sebastian Sura <124262655+sebsura@users.noreply.github.com>
- add a commented way to detect connection in close_wait state leak.

Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
- add copyright notice for new testrunner-default

Co-authored-by: Sebastian Sura <124262655+sebsura@users.noreply.github.com>
@BareosBot BareosBot force-pushed the dev/bruno/master/libcloud-modularize-systemtest branch from 0a9bac9 to aa2323e Compare December 12, 2023 14:40
@BareosBot BareosBot merged commit 23c855a into bareos:master Dec 12, 2023
@bruno-at-bareos bruno-at-bareos deleted the dev/bruno/master/libcloud-modularize-systemtest branch January 15, 2024 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants