feat: add docker test for current protocol(vmess, ss, trojan) #324

VendettaReborn · 2024-03-17T08:53:21Z

🤔 This is a ...

🔗 Related issue link

#246

💡 Background and solution

background: currently, there is no verification for the protocol implementations
solution: migrate docker test logic in clash.meta to clash-rs

📝 Changelog

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

Doc is updated/provided or not needed
Changelog is provided or not needed

To Be Discussed

whether we need this test method
should we add some docs or setup codes(to pull the images)
whether we should run ignore the docker test in github actions

ibigbug

thanks!

couple of questions

clash_lib/src/proxy/utils/test_utils/docker_runner.rs

ibigbug · 2024-03-17T10:18:14Z

~~we should also setup Docker on the CI runners?~~

actually, not necessary https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md#tools

clash_lib/src/proxy/utils/test_utils/docker_runner.rs

Bumps [clap](https://github.com/clap-rs/clap) from 4.5.2 to 4.5.3. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@v4.5.2...v4.5.3) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [h2](https://github.com/hyperium/h2) from 0.4.2 to 0.4.3. - [Release notes](https://github.com/hyperium/h2/releases) - [Changelog](https://github.com/hyperium/h2/blob/master/CHANGELOG.md) - [Commits](hyperium/h2@v0.4.2...v0.4.3) --- updated-dependencies: - dependency-name: h2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.77 to 0.1.78. - [Release notes](https://github.com/dtolnay/async-trait/releases) - [Commits](dtolnay/async-trait@0.1.77...0.1.78) --- updated-dependencies: - dependency-name: async-trait dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.9.32 to 0.9.33. - [Release notes](https://github.com/dtolnay/serde-yaml/releases) - [Commits](dtolnay/serde-yaml@0.9.32...0.9.33) --- updated-dependencies: - dependency-name: serde_yaml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [brotli](https://github.com/dropbox/rust-brotli) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/dropbox/rust-brotli/releases) - [Commits](https://github.com/dropbox/rust-brotli/commits) --- updated-dependencies: - dependency-name: brotli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [async-recursion](https://github.com/dcchut/async-recursion) from 1.0.5 to 1.1.0. - [Release notes](https://github.com/dcchut/async-recursion/releases) - [Commits](dcchut/async-recursion@v1.0.5...v1.1.0) --- updated-dependencies: - dependency-name: async-recursion dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ectness

ibigbug · 2024-03-19T10:04:05Z

btw the cargo fmt is failing

ibigbug

couple of comments

clash_lib/Cargo.toml

clash_lib/src/proxy/utils/test_utils/docker_runner.rs

clash_lib/src/proxy/vmess/mod.rs

clash_lib/src/proxy/utils/test_utils/mod.rs

clash_lib/src/proxy/utils/test_utils/docker_runner.rs

Signed-off-by: Yuwei Ba <[email protected]>

ibigbug · 2024-03-26T13:33:26Z

clash_lib/src/proxy/utils/test_utils/mod.rs

-                error!("Failed to accept connection: {}", e);
-                Err(anyhow!("Failed to accept connection: {}", e))
-            }
+        loop {


@VendettaReborn this should be a loop

for our case it might be fine as we only have 1 conn.

it was actually failing for me on macos as the proxy server inside container can't connect to the listener outside the vm on the host mac machine

ibigbug · 2024-03-26T13:40:58Z

the condition is failing on Windows

   2 |  CLASH_RS_CI=true cargo test --all --all-features
     |  ~~~~~~~~~~~~~~~~
     | The term 'CLASH_RS_CI=true' is not recognized as a name of a cmdlet, function, script file, or executable
     | program. Check the spelling of the name, or if a path was included, verify that the path is correct and try
     | again.
Error: Process completed with exit code 1.

VendettaReborn · 2024-03-26T16:07:11Z

the condition is failing on Windows

   2 |  CLASH_RS_CI=true cargo test --all --all-features
     |  ~~~~~~~~~~~~~~~~
     | The term 'CLASH_RS_CI=true' is not recognized as a name of a cmdlet, function, script file, or executable
     | program. Check the spelling of the name, or if a path was included, verify that the path is correct and try
     | again.
Error: Process completed with exit code 1.

i see...

Signed-off-by: Yuwei Ba <[email protected]>

feat: add docker test for current protocol(vmess, ss, trojan)

b395058

ibigbug reviewed Mar 17, 2024

View reviewed changes

clash_lib/src/proxy/utils/test_utils/docker_runner.rs Outdated Show resolved Hide resolved

clash_lib/src/proxy/utils/test_utils/docker_runner.rs Outdated Show resolved Hide resolved

clash_lib/src/proxy/utils/test_utils/docker_runner.rs Outdated Show resolved Hide resolved

ibigbug reviewed Mar 17, 2024

View reviewed changes

clash_lib/src/proxy/utils/test_utils/docker_runner.rs Outdated Show resolved Hide resolved

VendettaReborn and others added 11 commits March 18, 2024 23:35

fix opt.host in http2 config (#323)

051b460

optimize docker test structure; use serial test to make sure the corr…

3e60e5a

…ectness

move println to tracing

8af53f1

rename; add doc

90a5b6e

simplify DockerTestRunner type signature

4a692b9

VendettaReborn added 2 commits March 19, 2024 23:23

simplify DockerTestRunner, remove useless exec function

675d1f8

fix format error

b6a4a6d

ibigbug reviewed Mar 19, 2024

View reviewed changes

VendettaReborn and others added 8 commits March 19, 2024 23:47

exclude macos from the docker test's supported archs

4255805

use build flag to gate tests

7911d72

fix ci error; simplify the docker test code, add timeoutlogic

c91162d

Bump uuid from 1.7.0 to 1.8.0 (#331)

958940b

Update README.md

6ff61be

Signed-off-by: Yuwei Ba <[email protected]>

gix style warnings

e03ba8c

error propgating

cdd1875

Merge branch 'master' into feat/docker_test

d5ef72f

ibigbug reviewed Mar 26, 2024

View reviewed changes

VendettaReborn and others added 3 commits March 28, 2024 14:28

fix env variable in github action

39d7b4c

fix ci error

ebdb619

Update ci.yml

5d18edb

Signed-off-by: Yuwei Ba <[email protected]>

ibigbug merged commit aa10b1c into master Mar 28, 2024
15 checks passed

ibigbug deleted the feat/docker_test branch March 28, 2024 11:39

VendettaReborn mentioned this pull request Apr 6, 2024

enhance/multi docker test #358

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add docker test for current protocol(vmess, ss, trojan) #324

feat: add docker test for current protocol(vmess, ss, trojan) #324

VendettaReborn commented Mar 17, 2024 •

edited

Loading

ibigbug left a comment

ibigbug commented Mar 17, 2024 •

edited

Loading

ibigbug commented Mar 19, 2024

ibigbug left a comment

ibigbug Mar 26, 2024

ibigbug Mar 26, 2024

ibigbug Mar 26, 2024

ibigbug commented Mar 26, 2024

VendettaReborn commented Mar 26, 2024

feat: add docker test for current protocol(vmess, ss, trojan) #324

feat: add docker test for current protocol(vmess, ss, trojan) #324

Conversation

VendettaReborn commented Mar 17, 2024 • edited Loading

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self-Check before Merge

To Be Discussed

ibigbug left a comment

Choose a reason for hiding this comment

ibigbug commented Mar 17, 2024 • edited Loading

ibigbug commented Mar 19, 2024

ibigbug left a comment

Choose a reason for hiding this comment

ibigbug Mar 26, 2024

Choose a reason for hiding this comment

ibigbug Mar 26, 2024

Choose a reason for hiding this comment

ibigbug Mar 26, 2024

Choose a reason for hiding this comment

ibigbug commented Mar 26, 2024

VendettaReborn commented Mar 26, 2024

VendettaReborn commented Mar 17, 2024 •

edited

Loading

ibigbug commented Mar 17, 2024 •

edited

Loading