Skip to content

integration: organize bundle directory per test#39506

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:group_test_subdirs
Jul 12, 2019
Merged

integration: organize bundle directory per test#39506
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:group_test_subdirs

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 12, 2019 •
edited
Loading

The test-integration/test=integration-cli directory contains a directory for each daemon that was created during the integration tests, which makes it a long list to browse through. In addition, some tests spin up multiple daemons, and when debugging test-failures, the daemon-logs often have to be looked at together.

This patch organizes the bundle directory to group daemon storage locations per test, making it easier to find information about all the daemons that were used in a specific test.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
integration: organize bundle directory per test
9b5e788 
The test-integration/test=integration-cli directory contains
a directory for each daemon that was created during the integration
tests, which makes it a long list to browse through. In addition,
some tests spin up multiple daemons, and when debugging test-failures,
the daemon-logs often have to be looked at together.

This patch organizes the bundl directory to group daemon storage
locationos per test, making it easier to find information about
all the daemons that were used in a specific test.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 12, 2019

RS5 failure will be fixed by #39168

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 12, 2019 •
edited
Loading

Bundle now looks like this;

tree -L 3
.
├── test-docker-py
│   ├── docker.log
│   └── test.log
└── test-integration
    ├── DockerDaemonSuite.TestBridgeIPIsExcludedFromAllocatorPool
    │   └── d0affcf7210d0
    ├── DockerDaemonSuite.TestBuildOnDisabledBridgeNetworkDaemon
    │   └── d21332a504bfe
    ├── DockerDaemonSuite.TestCLIProxyProxyTCPSock
    │   └── d321e58161688
    ├── DockerDaemonSuite.TestCleanupMountsAfterDaemonAndContainerKill
    │   └── de822b7da642a
    ├── DockerDaemonSuite.TestCleanupMountsAfterDaemonCrash
    │   └── d8fe570564d1b
    ...
    ├── DockerDaemonSuite.TestDaemonStartWithIpcModes
    │   ├── d1b55143d8e28
    │   ├── d2705472b2822
    │   ├── d5346ab822719
    │   ├── d539b9d2dd508
    │   ├── d77109486d093
    │   ├── d7b04534b2691
    │   ├── d8b82b8a644d2
    │   ├── dba66df10e486
    │   ├── dd638ce0f4bb6
    │   └── dee4be9b4e9e6

Subtests are also nested:

tree -L 6

...
    ├── TestDaemonRestartKillContainers
    │   ├── live-restore=false
    │   │   ├── container_created_should_not_be_restarted
    │   │   │   ├── kill-daemon
    │   │   │   │   └── d634e41ec15f4
    │   │   │   └── stop-daemon
    │   │   │       └── d2d2e327fb82c
    │   │   ├── container_with_restart=always
    │   │   │   ├── kill-daemon
    │   │   │   │   └── defe32d5c8a7c
    │   │   │   └── stop-daemon
    │   │   │       └── d779592f7bfa4
    │   │   └── container_without_restart_policy
    │   │       ├── kill-daemon
    │   │       │   └── d7c5e16fb1dc7
    │   │       └── stop-daemon
    │   │           └── dacb497ab586f
    │   └── live-restore=true
    │       ├── container_created_should_not_be_restarted
    │       │   ├── kill-daemon
    │       │   │   └── daefc856c7cc7
    │       │   └── stop-daemon
    │       │       └── da7deae6b2c99
    │       ├── container_with_restart=always
    │       │   ├── kill-daemon
    │       │   │   └── d59b459b436ba
    │       │   └── stop-daemon
    │       │       └── d472d7393a742
    │       └── container_without_restart_policy
    │           ├── kill-daemon
    │           │   └── dba70957079c5
    │           └── stop-daemon
    │               └── dd0869c7dea4b

Wondering if that nesting is too deep, but I think it works ok

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 12, 2019

@cpuguy83 @vdemeester PTAL

vdemeester
vdemeester approved these changes Jul 12, 2019
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

cpuguy83
cpuguy83 approved these changes Jul 12, 2019
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov
Copy link

codecov bot commented Jul 12, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@2fc3480). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #39506   +/-   ##
=========================================
  Coverage          ?   37.32%           
=========================================
  Files             ?      609           
  Lines             ?    45224           
  Branches          ?        0           
=========================================
  Hits              ?    16878           
  Misses            ?    26057           
  Partials          ?     2289

@thaJeztah thaJeztah merged commit 0e041d6 into moby:master Jul 12, 2019
@thaJeztah thaJeztah deleted the group_test_subdirs branch July 12, 2019 19:50
This was referenced Aug 19, 2019
Merged
Merged
@thaJeztah thaJeztah mentioned this pull request Aug 26, 2019
Merged
2 tasks
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

+1 more reviewer

@vdemeester vdemeester vdemeester approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/testing process/cherry-picked status/2-code-review status/4-merge

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @vdemeester @cpuguy83 @GordonTheTurtle