Skip to content

Split redis tests into separate test assembly #4468

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

Merged
merged 19 commits into from
Jul 10, 2024
Merged

Split redis tests into separate test assembly #4468

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
50a9e63
Split redis tests into separate test assembly
davidfowl Jun 11, 2024
8d36ff8
Made some fixes
davidfowl Jun 11, 2024
c6a1655
Added functional test
davidfowl Jun 12, 2024
fbda632
Use the resource name
davidfowl Jun 12, 2024
3488419
Merge remote-tracking branch 'origin/main' into davidfowl/redis-tests
sebastienros Jul 1, 2024
98d2f86
PR feedback
sebastienros Jul 1, 2024
7e9eef0
Fix documentation
sebastienros Jul 1, 2024
c8be7b3
Mark functional test with RequiresDocker
sebastienros Jul 1, 2024
6462358
Create AddDataVolume tests for Redis
sebastienros Jul 1, 2024
1394ee8
Add BindMount tests
sebastienros Jul 2, 2024
7268fe3
Add false positive check
sebastienros Jul 2, 2024
6818dab
Merge remote-tracking branch 'origin/main' into davidfowl/redis-tests
sebastienros Jul 3, 2024
03e54d3
Import TestServiceProvider
sebastienros Jul 3, 2024
153f97b
Debugging functional tests
sebastienros Jul 3, 2024
0859fb6
Apply PR feedback
sebastienros Jul 9, 2024
497e633
Remove InternalVisibleTo
sebastienros Jul 9, 2024
c55aa34
Delete volumes after usage
sebastienros Jul 9, 2024
9bc54e9
Fix erroneous samples
sebastienros Jul 9, 2024
69f4ea9
Move AttemptDeleteDockerVolume to Utils class
sebastienros Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 44 additions & 31 deletions Aspire.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "python", "python", "{7123AB
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.AppHost", "playground\python\Python.AppHost\Python.AppHost.csproj", "{173BDA6E-F175-4457-BF64-58CD184E9A81}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{C424395C-1235-41A4-BF55-07880A04368C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hosting", "Hosting", "{830A89EC-4029-4753-B25A-068BAE37DEC7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Hosting.Redis.Tests", "tests\Aspire.Hosting.Redis.Tests\Aspire.Hosting.Redis.Tests.csproj", "{1BC02557-B78B-48CE-9D3C-488A6B7672F4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1316,6 +1322,10 @@ Global
{173BDA6E-F175-4457-BF64-58CD184E9A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{173BDA6E-F175-4457-BF64-58CD184E9A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{173BDA6E-F175-4457-BF64-58CD184E9A81}.Release|Any CPU.Build.0 = Release|Any CPU
{1BC02557-B78B-48CE-9D3C-488A6B7672F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BC02557-B78B-48CE-9D3C-488A6B7672F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BC02557-B78B-48CE-9D3C-488A6B7672F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1BC02557-B78B-48CE-9D3C-488A6B7672F4}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -1333,35 +1343,35 @@ Global
{7570F683-EB48-467F-B1B1-70FF0153F52B} = {63BB22D3-0FAC-4E87-BF9D-9FA2441684C9}
{327CB76F-3BB8-4955-A01D-CD8553AD36CC} = {63BB22D3-0FAC-4E87-BF9D-9FA2441684C9}
{B38EBDC8-9255-4AC2-A10E-5C908D4BE862} = {77CFE74A-32EE-400C-8930-5025E8555256}
{5A7D4F1C-98CB-45D5-955E-A601CFA70884} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{5A7D4F1C-98CB-45D5-955E-A601CFA70884} = {C424395C-1235-41A4-BF55-07880A04368C}
{CC9CD371-9909-4101-83F1-22C7C2617DE4} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{955EDC6D-11A3-4408-9C00-7BFE140AD597} = {A68BA1A5-1604-433D-9778-DC0199831C2A}
{0F505BE9-42FE-49EC-93CC-57584C4C9671} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{47714F18-6CEC-4F61-92BC-BAE60C619F61} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{39AD3DBA-6B79-44FC-9637-232544D0CA46} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{0C97F423-DAAE-4B63-B1B1-CB85E2840B98} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{23075FC1-D893-434D-9A20-02870B96ABA7} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{F371C3EE-8AB3-4261-A5F2-9A1FF77ADC19} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{6E7B2D62-A1A4-4232-8FA9-DB01A454B9C1} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{26E8EA4C-D3A6-4C6A-900D-2AA2C80D0AAF} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{23075FC1-D893-434D-9A20-02870B96ABA7} = {C424395C-1235-41A4-BF55-07880A04368C}
{F371C3EE-8AB3-4261-A5F2-9A1FF77ADC19} = {C424395C-1235-41A4-BF55-07880A04368C}
{6E7B2D62-A1A4-4232-8FA9-DB01A454B9C1} = {C424395C-1235-41A4-BF55-07880A04368C}
{26E8EA4C-D3A6-4C6A-900D-2AA2C80D0AAF} = {C424395C-1235-41A4-BF55-07880A04368C}
{7C4F0F84-BAEC-469D-A3BC-28209B2C11AC} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{CD7BF1EC-ABF9-48DE-8683-353216DB4958} = {7C4F0F84-BAEC-469D-A3BC-28209B2C11AC}
{845B39FE-A982-44EB-A4DB-CCCD93CBF261} = {7C4F0F84-BAEC-469D-A3BC-28209B2C11AC}
{29012D95-AA39-4DC9-AFAA-2FC3A8CDEF33} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
{AC5970BF-7A71-4CFE-BC21-8E597ECD347C} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{D403DB4A-ABFC-4B13-A920-C6AC9B3EEE0B} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
{88A89C15-11DF-4F32-AA61-6896AF09F470} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{06D5A9E7-8CAA-4F0F-A41E-8C97D2FF8542} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{06D5A9E7-8CAA-4F0F-A41E-8C97D2FF8542} = {C424395C-1235-41A4-BF55-07880A04368C}
{2E1E217C-A836-49E3-B655-6E42AD3E7943} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{59B8C4DE-FB94-4670-9DDE-B04F461219CB} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{59B8C4DE-FB94-4670-9DDE-B04F461219CB} = {C424395C-1235-41A4-BF55-07880A04368C}
{FFFD251E-F555-4008-A759-5727784B0C98} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{E0E0D5C0-E8D1-458E-9C3A-F0B858BBAD3B} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{E0E0D5C0-E8D1-458E-9C3A-F0B858BBAD3B} = {C424395C-1235-41A4-BF55-07880A04368C}
{EEED6AD9-6FC3-4483-B44E-691FF2DECFAF} = {63BB22D3-0FAC-4E87-BF9D-9FA2441684C9}
{A3262B32-E4F6-4F95-9BB9-D522F798C0D3} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{B130B8E2-BF6E-4541-856F-F51558F8050A} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{B130B8E2-BF6E-4541-856F-F51558F8050A} = {C424395C-1235-41A4-BF55-07880A04368C}
{1CB79745-8A58-4AE7-B6C8-2362DCDB1CA6} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{56D1697B-8CF9-4994-A484-060878821F9D} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{D3B3AFFF-211A-4450-AE5E-055BD1323D2E} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{56D1697B-8CF9-4994-A484-060878821F9D} = {C424395C-1235-41A4-BF55-07880A04368C}
{D3B3AFFF-211A-4450-AE5E-055BD1323D2E} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
{C3BA722D-B03F-465B-BC47-421CA97B97E0} = {975F6F41-B455-451D-A312-098DE4A167B6}
{975F6F41-B455-451D-A312-098DE4A167B6} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{31F5E4F3-AC4E-4538-BC7D-85BCF9CA686A} = {975F6F41-B455-451D-A312-098DE4A167B6}
Expand All @@ -1370,9 +1380,9 @@ Global
{1ABCD945-5CAA-4F30-A741-7A9DA919254A} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{8C6877C0-3CB2-4B99-B8BD-1B7D0CADB543} = {F534D4F8-5E3A-42FC-BCD7-4C2D6060F9C8}
{E20280B8-8BE0-4967-AFC2-65FFCD6EC5E4} = {F534D4F8-5E3A-42FC-BCD7-4C2D6060F9C8}
{6EAA089D-7ADD-4C74-B040-FD3D75DB5C75} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{9D9C360B-9DF1-4076-8416-66964427C8F3} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{67B9A8E4-7F51-4419-85BC-4BB0C2E67E71} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{6EAA089D-7ADD-4C74-B040-FD3D75DB5C75} = {C424395C-1235-41A4-BF55-07880A04368C}
{9D9C360B-9DF1-4076-8416-66964427C8F3} = {C424395C-1235-41A4-BF55-07880A04368C}
{67B9A8E4-7F51-4419-85BC-4BB0C2E67E71} = {C424395C-1235-41A4-BF55-07880A04368C}
{57A42144-739E-49A7-BADB-BB8F5F20FA17} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{185BCD98-BD26-4535-BE6E-44AAA4F7C145} = {57A42144-739E-49A7-BADB-BB8F5F20FA17}
{B1D88C56-46EB-4171-A997-56E67875CF80} = {57A42144-739E-49A7-BADB-BB8F5F20FA17}
Expand All @@ -1381,14 +1391,14 @@ Global
{A68BA1A5-1604-433D-9778-DC0199831C2A} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{23298562-C1D4-41CD-83FE-426C94FEE35F} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{00C9BA50-2AFB-4D9C-A2D6-8154BCCD0A63} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{A5836BC1-6A45-4BB6-9D22-A7F750890AB8} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{FDA02617-9C49-4DA8-A43A-A34DBA9B8596} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{A5836BC1-6A45-4BB6-9D22-A7F750890AB8} = {C424395C-1235-41A4-BF55-07880A04368C}
{FDA02617-9C49-4DA8-A43A-A34DBA9B8596} = {C424395C-1235-41A4-BF55-07880A04368C}
{A84C4EE3-2601-4804-BCDC-E9948E164A22} = {A68BA1A5-1604-433D-9778-DC0199831C2A}
{4D8A92AB-4E77-4965-AD8E-8E206DCE66A4} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{165411FE-755E-4869-A756-F87F455860AC} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{165411FE-755E-4869-A756-F87F455860AC} = {C424395C-1235-41A4-BF55-07880A04368C}
{6472D59F-7C04-43DE-AD33-9F20BE3804BF} = {975F6F41-B455-451D-A312-098DE4A167B6}
{CA283D7F-EB95-4353-B196-C409965D2B42} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{C8079F06-304F-49B1-A0C1-45AA3782A923} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{C8079F06-304F-49B1-A0C1-45AA3782A923} = {C424395C-1235-41A4-BF55-07880A04368C}
{DCF2D47A-921A-4900-B5B2-CF97B3531CE8} = {975F6F41-B455-451D-A312-098DE4A167B6}
{91F22EEA-EB23-425A-9B32-9438A0809F4B} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{74F89D52-645B-4283-98AF-D04DA794EE37} = {91F22EEA-EB23-425A-9B32-9438A0809F4B}
Expand All @@ -1401,25 +1411,25 @@ Global
{3112D63C-A9E3-44F8-92A5-8F3052627312} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
{20A5A907-A135-4735-B4BF-E13514F360E3} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{39FA2A64-012F-4EB9-A14F-E8AC54C975F6} = {2136E31D-2CBB-41BB-8618-716FF8E46E9E}
{E592E447-BA3C-44FA-86C1-EBEDC864A644} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{E592E447-BA3C-44FA-86C1-EBEDC864A644} = {C424395C-1235-41A4-BF55-07880A04368C}
{00FEA181-84C9-42A7-AC81-29A9F176A1A0} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{1828FA88-6BFB-437E-A163-A98AE2B948F1} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{52CF3584-4861-4769-AD20-F7173F2D8F75} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{52CF3584-4861-4769-AD20-F7173F2D8F75} = {C424395C-1235-41A4-BF55-07880A04368C}
{A778F29A-6C40-4C53-A793-F23F20679ADE} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{A331C123-35A5-4E81-9999-354159821374} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{A331C123-35A5-4E81-9999-354159821374} = {C424395C-1235-41A4-BF55-07880A04368C}
{11EF253D-086B-4358-9A50-2695913BD7E1} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
{8BAF2119-8370-4E9E-A887-D92506F8C727} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{04B03D1C-45C5-44D4-AEE5-BC315F3D9D26} = {8BAF2119-8370-4E9E-A887-D92506F8C727}
{20758E81-7316-49AC-8E1B-A5461397530A} = {8BAF2119-8370-4E9E-A887-D92506F8C727}
{F7D9FA54-1F64-4A36-961A-0087F8E88D07} = {8BAF2119-8370-4E9E-A887-D92506F8C727}
{174E0507-3BB0-4CDC-829E-9CA75DA66473} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{A8CB331A-1247-41D9-8118-538E5A2CC9DF} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{A8CB331A-1247-41D9-8118-538E5A2CC9DF} = {C424395C-1235-41A4-BF55-07880A04368C}
{DBEDDF76-1C33-4943-8CCB-337A7D48AFF5} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{51DDD6BC-1D6C-466A-B509-FC49E3BD72E4} = {DBEDDF76-1C33-4943-8CCB-337A7D48AFF5}
{EABB20A8-CDA2-4AFE-A5B1-FB631200CD64} = {DBEDDF76-1C33-4943-8CCB-337A7D48AFF5}
{25208C6F-0A9D-4D60-9EDD-256C9891B1CD} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{C565532A-0754-44FE-A0C7-78D5338DDBCA} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{BFAF55A8-A737-4EC1-BBA2-76001A8F16E0} = {C424395C-1235-41A4-BF55-07880A04368C}
{2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{7616FD70-6BEC-439D-B39E-A838F939C0F9} = {2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD}
{78ABCF96-507B-4E5F-9265-CACC3EFD4C53} = {2CA6AB88-21EF-4488-BB1B-3A5BAD5FE2AD}
Expand All @@ -1428,7 +1438,7 @@ Global
{40EC38A2-69DB-4759-81C8-13F31090FEA6} = {C544D8A6-977E-40EA-8B1A-1FB2146A2108}
{83267206-9438-42CD-860C-C92E7DBAA4C3} = {A68BA1A5-1604-433D-9778-DC0199831C2A}
{0921F457-16A7-40C8-86B4-7FB02D52244F} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{3DE1697E-BB8C-4EBA-8DCA-0A6A94804689} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{3DE1697E-BB8C-4EBA-8DCA-0A6A94804689} = {C424395C-1235-41A4-BF55-07880A04368C}
{C1483B79-4FE9-47FF-B544-EB5DBB7A0A3E} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{F1387494-34DE-4B31-B587-699B2E9A20CA} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{54B66163-016D-4122-9364-409AB61BC36B} = {F1387494-34DE-4B31-B587-699B2E9A20CA}
Expand All @@ -1451,12 +1461,12 @@ Global
{8AA07A14-A4A7-45EC-B0F6-4690B516B16D} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{157A434E-E3CA-4080-96CF-903CC3DF66E9} = {8AA07A14-A4A7-45EC-B0F6-4690B516B16D}
{921CB408-5E37-4354-B4CF-EAE517F633DC} = {8AA07A14-A4A7-45EC-B0F6-4690B516B16D}
{C774BE00-EE93-4148-B866-8F0F2BA1E473} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{C774BE00-EE93-4148-B866-8F0F2BA1E473} = {C424395C-1235-41A4-BF55-07880A04368C}
{0870A667-FB0C-4758-AEAF-9E5F092AD7C1} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{C4833DEC-0A4F-4504-B8D0-06C60B84119C} = {91F22EEA-EB23-425A-9B32-9438A0809F4B}
{9CA94707-E801-444F-A582-D5BD0104CF9B} = {91F22EEA-EB23-425A-9B32-9438A0809F4B}
{3216CF59-84B0-46FF-8572-D0AFB0155423} = {A7C6452C-FEDB-4883-9AE7-29892D260AA3}
{BE46B5B3-DFD4-4565-A2CD-7D95C623B03D} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{BE46B5B3-DFD4-4565-A2CD-7D95C623B03D} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
{8B1802BC-6CB0-4027-850C-2AED42A82C9E} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{7CC9BADD-B444-49E0-B6F0-BE2CD3A4669E} = {8B1802BC-6CB0-4027-850C-2AED42A82C9E}
{E5C93F8B-D31B-4268-89EB-830EDC5524D0} = {8B1802BC-6CB0-4027-850C-2AED42A82C9E}
Expand All @@ -1474,7 +1484,7 @@ Global
{51654CD7-2E05-4664-B2EB-95308A300609} = {9C30FFD6-2262-45E7-B010-24B30E0433C2}
{0244203D-7491-4414-9C88-10BFED9C5B2D} = {9C30FFD6-2262-45E7-B010-24B30E0433C2}
{7C07AF64-1E53-4640-A7EF-6EE23D2F0BDA} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{D13F77BA-1FD1-4CEA-AEBB-9A28B033B2D3} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{D13F77BA-1FD1-4CEA-AEBB-9A28B033B2D3} = {C424395C-1235-41A4-BF55-07880A04368C}
{90A70EFA-F26A-49E0-A375-DB461E4E0E25} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{36B782B3-9515-4AF0-BDB1-52062CECF6FD} = {90A70EFA-F26A-49E0-A375-DB461E4E0E25}
{B1EB813D-1CAA-406F-9786-756939B7232C} = {90A70EFA-F26A-49E0-A375-DB461E4E0E25}
Expand Down Expand Up @@ -1531,12 +1541,12 @@ Global
{74644A4D-8F61-4314-B6E8-5CE3802CD6C2} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{427F4D7C-8969-4015-AD1A-5EFFE921A184} = {77CFE74A-32EE-400C-8930-5025E8555256}
{E0E1B557-D3CF-4446-B993-E5CE719234FB} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{A9CFA376-0C90-4231-9152-FBF14065195A} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{8191109E-130C-47F3-B84E-82070A6CD269} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{A9CFA376-0C90-4231-9152-FBF14065195A} = {C424395C-1235-41A4-BF55-07880A04368C}
{8191109E-130C-47F3-B84E-82070A6CD269} = {C424395C-1235-41A4-BF55-07880A04368C}
{906B5687-31AD-4364-AD9F-B4B26113462D} = {8BAF2119-8370-4E9E-A887-D92506F8C727}
{75760E8A-7025-4F6A-B152-6622688D0E7D} = {8BAF2119-8370-4E9E-A887-D92506F8C727}
{3ECB176E-3CC8-4BEE-AF48-F439F9742C8B} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{0505F739-6F85-4502-A554-77E0D7325F26} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{0505F739-6F85-4502-A554-77E0D7325F26} = {C424395C-1235-41A4-BF55-07880A04368C}
{B5D637F3-7E44-4C7D-AE4B-D56D400671CD} = {7C4F0F84-BAEC-469D-A3BC-28209B2C11AC}
{920BB263-E68F-4FA2-93FC-2E385EEA405B} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{A39389A0-E780-4B97-808B-DC95CF59B35C} = {920BB263-E68F-4FA2-93FC-2E385EEA405B}
Expand All @@ -1548,14 +1558,17 @@ Global
{13219E70-5647-4B71-95DC-2C8AFA2A4C5D} = {BD2CD8FB-18EC-4930-8228-C49D89622022}
{1A3A4865-69F2-4251-9A95-2D57C6A46870} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
{1BFE3C02-3B81-4596-99A2-4DCDD9129C9A} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{9FAE1602-2C69-4D24-8655-A164489441E8} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{9FAE1602-2C69-4D24-8655-A164489441E8} = {C424395C-1235-41A4-BF55-07880A04368C}
{DF00FDA3-D3EC-4E07-B4EC-0EBB57A813A4} = {77CFE74A-32EE-400C-8930-5025E8555256}
{5CB63205-24F4-4388-A41B-BAF3BEA59866} = {B80354C7-BE58-43F6-8928-9F3A74AB7F47}
{A6813855-E322-41EF-B2E6-7A44949EF962} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{E6BE41D3-872C-47D2-B5B1-78C37AFAEAF9} = {A6813855-E322-41EF-B2E6-7A44949EF962}
{588CD2D7-EE70-43C1-8233-330854BDF53C} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{7123AB7A-A4FD-4F64-8B05-D2DD0C3E2ABC} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{173BDA6E-F175-4457-BF64-58CD184E9A81} = {7123AB7A-A4FD-4F64-8B05-D2DD0C3E2ABC}
{C424395C-1235-41A4-BF55-07880A04368C} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{830A89EC-4029-4753-B25A-068BAE37DEC7} = {4981B3A5-4AFD-4191-BF7D-8692D9783D60}
{1BC02557-B78B-48CE-9D3C-488A6B7672F4} = {830A89EC-4029-4753-B25A-068BAE37DEC7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Hosting.Redis/Aspire.Hosting.Redis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

<ItemGroup>
<InternalsVisibleTo Include="Aspire.Hosting.Tests" />
Copy link
Member Author

@davidfowl davidfowl Jun 11, 2024

Choose a reason for hiding this comment

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

We should aim to remove this.

<InternalsVisibleTo Include="Aspire.Hosting.Redis.Tests" />
Copy link
Member

@eerhardt eerhardt Jul 3, 2024

Choose a reason for hiding this comment

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

@sebastienros - can we remove this? What is it needed for?

Copy link
Member

@sebastienros sebastienros Jul 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

RedisContainerImageTags
RedisCommanderConfigWriterHook

Are used in these tests and internal.
This is why Aspire.Hosting.Tests was already listed, because these tests are coming from this project (moved to this new Aspire.Hosting.Redis.Tests)

</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public static IResourceBuilder<RedisResource> WithDataVolume(this IResourceBuild
/// Use <see cref="WithPersistence(IResourceBuilder{RedisResource}, TimeSpan?, long)"/> to adjust Redis persistence configuration, e.g.:
/// <code lang="csharp">
/// var cache = builder.AddRedis("cache")
/// .WithDataBindMount()
/// .WithDataBindMount("myredisdata")
/// .WithPersistence(TimeSpan.FromSeconds(10), 5);
/// </code>
/// </remarks>
Expand Down
6 changes: 3 additions & 3 deletions tests/Aspire.Hosting.Containers.Tests/ContainerResourceBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public void WithImageMutatesImageNameOfLastAnnotation()
public void WithImageTagMutatesImageTag()
{
using var builder = TestDistributedApplicationBuilder.Create();
var redis = builder.AddContainer("redis", "redis").WithImageTag("foo");
Assert.Equal("foo", redis.Resource.Annotations.OfType<ContainerImageAnnotation>().Single().Tag);
var redis = builder.AddContainer("redis", "redis").WithImageTag("7.1");
Assert.Equal("7.1", redis.Resource.Annotations.OfType<ContainerImageAnnotation>().Single().Tag);
}

[Fact]
Expand All @@ -80,7 +80,7 @@ public void WithImageTagThrowsIfNoImageAnnotation()
using var builder = TestDistributedApplicationBuilder.Create();
var container = builder.AddResource(new TestContainerResource("testcontainer"));

var exception = Assert.Throws<InvalidOperationException>(() => container.WithImageTag("foo"));
var exception = Assert.Throws<InvalidOperationException>(() => container.WithImageTag("7.1"));
Assert.Equal("The resource 'testcontainer' does not have a container image specified. Use WithImage to specify the container image and tag.", exception.Message);
}

Expand Down
20 changes: 14 additions & 6 deletions ...pire.Hosting.Tests/Redis/AddRedisTests.cs → ...pire.Hosting.Redis.Tests/AddRedisTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Net.Sockets;
using Aspire.Hosting.Redis;
using Aspire.Hosting.ApplicationModel;
using Aspire.Hosting.Tests.Utils;
using Aspire.Hosting.Utils;
using Microsoft.Extensions.DependencyInjection;
using Xunit;

namespace Aspire.Hosting.Tests.Redis;
namespace Aspire.Hosting.Redis.Tests;

public class AddRedisTests
{
Expand Down Expand Up @@ -125,7 +125,8 @@ public void WithRedisCommanderAddsRedisCommanderResource()
public void WithRedisCommanderSupportsChangingContainerImageValues()
{
var builder = DistributedApplication.CreateBuilder();
builder.AddRedis("myredis").WithRedisCommander(c => {
builder.AddRedis("myredis").WithRedisCommander(c =>
{
c.WithImageRegistry("example.mycompany.com");
c.WithImage("customrediscommander");
c.WithImageTag("someothertag");
Expand All @@ -142,7 +143,8 @@ public void WithRedisCommanderSupportsChangingContainerImageValues()
public void WithRedisCommanderSupportsChangingHostPort()
{
var builder = DistributedApplication.CreateBuilder();
builder.AddRedis("myredis").WithRedisCommander(c => {
builder.AddRedis("myredis").WithRedisCommander(c =>
{
c.WithHostPort(1000);
});

Expand All @@ -169,7 +171,10 @@ public async Task SingleRedisInstanceProducesCorrectRedisHostsVariable(string co

var commander = builder.Resources.Single(r => r.Name.EndsWith("-commander"));

var config = await EnvironmentVariableEvaluator.GetEnvironmentVariablesAsync(commander, DistributedApplicationOperation.Run, TestServiceProvider.Instance);
var config = await EnvironmentVariableEvaluator.GetEnvironmentVariablesAsync(
Copy link
Member

@sebastienros sebastienros Jul 9, 2024

Choose a reason for hiding this comment

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

Line too long couldn't read the code.

commander,
DistributedApplicationOperation.Run,
TestServiceProvider.Instance);

Assert.Equal($"myredis1:{containerHost}:5001:0", config["REDIS_HOSTS"]);
}
Expand All @@ -194,7 +199,10 @@ public async Task MultipleRedisInstanceProducesCorrectRedisHostsVariable(string

var commander = builder.Resources.Single(r => r.Name.EndsWith("-commander"));

var config = await EnvironmentVariableEvaluator.GetEnvironmentVariablesAsync(commander, DistributedApplicationOperation.Run, TestServiceProvider.Instance);
var config = await EnvironmentVariableEvaluator.GetEnvironmentVariablesAsync(
commander,
DistributedApplicationOperation.Run,
TestServiceProvider.Instance);

Assert.Equal($"myredis1:{containerHost}:5001:0,myredis2:host2:5002:0", config["REDIS_HOSTS"]);
}
Expand Down
Loading