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.

Sign up for GitHub

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

Jump to bottom

Coalesce directory management to Envoy::TestEnvironment #9721

Merged
merged 16 commits into from
Jan 26, 2020
Merged

Coalesce directory management to Envoy::TestEnvironment #9721

merged 16 commits into from
Jan 26, 2020

Commits on Jan 21, 2020

  1. Coallesce directory management to Envoy::TestEnvironment 

    - Drop std::[*]filesystem logic
- Implement/tests for new Envoy::Filesystem::splitFileName
- Remove unneeded TestEnvironment::createParentPath
- Move/rename Envoy::TestUtility::createDirectory to Envoy::TestEnvironment::createPath
- Move/rename Envoy::TestUtility::removeDirectory to Envoy::TestEnvironment::removePath
- Move Envoy::TestUtility::renameFile to Envoy::TestEnvironment
- Move Envoy::TestUtility::createSymlink to Envoy::TestEnvironment
- Move AtomicFileUpdater from test_common utility to environment
- Simplify Envoy::Filesystem::Watcher implementations using Filesystem
- Clean up watcher_impl flavors for splitFileName API
- Implement/new tests for Envoy::Filesystem::illegalPath for win32
- Implement watcher_impl for win32 [Initial development by Sam Smith]
- Ensure top level test tempdir exists when requested

Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sam Smith <sesmith177@gmail.com>

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe authored and sunjayBhatia committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    04dfaa5 View commit details
    Browse the repository at this point in the history

  2. Correct envoy-format warnings 

    Avert making envoy tweaks within 'clang-format off' blocks

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    a2c4599 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. Adjustments based on PR review (requested by mattklein123) 

    - Streamline the clang-format sensitivity for Envoy check/fix
- Rename splitFileName to splitPathFromFilename for clarity
  and change to absl::string_views for args and std::pair results
- Expose Api to watcher_impl for Filesystem
- All addWatch() implementations now take absl::string_view name args
- Clean up member variable naming for win32 watcher_impl
- Prefer RELEASE_ASSERT to throw for anticipated normal behavior

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    fb10fdf View commit details
    Browse the repository at this point in the history

  2. Caught error case, directory with broken symlink 

    Don't blow up in the DirectoryIterator for a broken link.
Treat broken symlinks as 'Regular' files to be unlinked.

Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
    @sunjayBhatia @wrowe
    sunjayBhatia and wrowe committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    37871c8 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2020

  1. Fix win32 and kqueue watcher implementation typos 

    Note: kqueue remains untested locally

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    dea7313 View commit details
    Browse the repository at this point in the history

  2. Address further requested reviews 

    - describe changes to directory_iterator_impl
- use braces on all if/for statements
- document source of windows invalid character table
- add more description to AtomicFileUpdater class
- capitalize test names in filesystem_impl_test

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
    @sunjayBhatia @wrowe
    sunjayBhatia and wrowe committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    08e9797 View commit details
    Browse the repository at this point in the history

  3. Add improvements to clang-format detection (per jmarantz) 

    - clang-format off blocks must be closed with clang-format on
- clang-format may not be nested

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>

Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe authored and sunjayBhatia committed Jan 23, 2020
    1 Configuration menu
    Copy the full SHA
    c1a5536 View commit details
    Browse the repository at this point in the history

  4. Change splitPathFromFilename to return a struct with named members 

    Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    609180e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into fix-filesystem-usage 

    Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
    @sunjayBhatia @wrowe
    sunjayBhatia and wrowe committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    b019384 View commit details
    Browse the repository at this point in the history

  6. Make the spell checker happy 

    Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    3eab6da View commit details
    Browse the repository at this point in the history

  7. Catch more ifs without braces 

    Signed-off-by: Sunjay Bhatia <sbhatia@pivotal.io>
Co-authored-by: William A Rowe Jr <wrowe@pivotal.io>
    @sunjayBhatia @wrowe
    sunjayBhatia and wrowe committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    d2ded9d View commit details
    Browse the repository at this point in the history

  8. More mac typos/compilation fixes 

    Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    6d34908 View commit details
    Browse the repository at this point in the history

  9. Clean up failing test 

    Resolves test failing due to no file to substitute within

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    e9e095c View commit details
    Browse the repository at this point in the history

  10. More requested reviews in watcher_impl 

    Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
Co-authored-by: Sunjay Bhatia <sbhatia@pivotal.io>
    @wrowe @sunjayBhatia
    wrowe and sunjayBhatia committed Jan 23, 2020
    Configuration menu
    Copy the full SHA
    5f233df View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2020

  1. Introduce mkdir -p recursive behavior 

    Initially we didn't believe the test framework required this, but those
tests named with the convention FooTest/PROTO will require FooTest to
first be created before PROTO.

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    e340a78 View commit details
    Browse the repository at this point in the history

  2. Don't invoke createPath with a trailing slash 

    Resolves TapIntegrationTest failure

Signed-off-by: William A Rowe Jr <wrowe@pivotal.io>
    @wrowe
    wrowe committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    ed7c38e View commit details
    Browse the repository at this point in the history