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

Feature/fix test py34 order #3389

Merged
merged 8 commits into from
Aug 23, 2018
Merged

Feature/fix test py34 order #3389

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0e145ab
Remove package files removed
lasote Aug 17, 2018
c6759bf
Merge branch 'develop' of github.com:conan-io/conan into develop
lasote Aug 20, 2018
5c25953
Merge branch 'develop' of github.com:conan-io/conan into develop
lasote Aug 20, 2018
b089917
Merge branch 'develop' of github.com:conan-io/conan into develop
lasote Aug 20, 2018
8c5a2b4
Merge branch 'develop' of github.com:conan-io/conan into develop
lasote Aug 20, 2018
fcca92f
Merge branch 'develop' of github.com:conan-io/conan into develop
lasote Aug 21, 2018
0aca667
Merge branch 'develop' of github.com:conan-io/conan into develop
lasote Aug 22, 2018
b6661bf
Fix test failing because of the order of a dict
lasote Aug 22, 2018
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
6 changes: 4 additions & 2 deletions conans/test/build_helpers/msbuild_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,10 @@ def custom_properties_test(self):
"arch": "x86_64"})
conanfile = MockConanfile(settings)
msbuild = MSBuild(conanfile)
command = msbuild.get_command("project_file.sln", properties={"MyProp1": "MyValue1", "MyProp2": "MyValue2"})
self.assertIn(' /p:MyProp1="MyValue1" /p:MyProp2="MyValue2"', command)
command = msbuild.get_command("project_file.sln", properties={"MyProp1": "MyValue1",
"MyProp2": "MyValue2"})
self.assertIn('/p:MyProp1="MyValue1"', command)
self.assertIn('/p:MyProp2="MyValue2"', command)

@unittest.skipUnless(platform.system() == "Windows", "Requires MSBuild")
def reuse_msbuild_object_test(self):
Expand Down