Merge lp://staging/~mandel/ubuntuone-windows-installer/update_nunit_net_4 into lp://staging/ubuntuone-windows-installer/beta
Proposed by
Manuel de la Peña
| Status: | Merged |
|---|---|
| Approved by: | Manuel de la Peña |
| Approved revision: | 120 |
| Merged at revision: | 108 |
| Proposed branch: | lp://staging/~mandel/ubuntuone-windows-installer/update_nunit_net_4 |
| Merge into: | lp://staging/ubuntuone-windows-installer/beta |
| Prerequisite: | lp://staging/~mandel/ubuntuone-windows-installer/update_to_vs2010 |
| Diff against target: |
11503 lines (+3/-11280) 19 files modified
src/Canonical.UbuntuOne.Client.Test/Notification/NotificationPresenterFixture.cs (+3/-43) tools/NUnit/NUnitFitTests.html (+0/-277) tools/NUnit/NUnitTests.config (+0/-84) tools/NUnit/NUnitTests.nunit (+0/-14) tools/NUnit/agent.conf (+0/-4) tools/NUnit/agent.log.conf (+0/-18) tools/NUnit/framework/nunit.framework.xml (+0/-10113) tools/NUnit/launcher.log.conf (+0/-18) tools/NUnit/nunit-agent-x86.exe.config (+0/-76) tools/NUnit/nunit-agent.exe.config (+0/-76) tools/NUnit/nunit-console-x86.exe.config (+0/-76) tools/NUnit/nunit-console.exe.config (+0/-76) tools/NUnit/nunit-x86.exe.config (+0/-91) tools/NUnit/nunit.exe.config (+0/-91) tools/NUnit/pnunit-agent.exe.config (+0/-77) tools/NUnit/pnunit-launcher.exe.config (+0/-77) tools/NUnit/runFile.exe.config (+0/-43) tools/NUnit/runpnunit.bat (+0/-2) tools/NUnit/test.conf (+0/-24) |
| To merge this branch: | bzr merge lp://staging/~mandel/ubuntuone-windows-installer/update_nunit_net_4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu One hackers | Pending | ||
|
Review via email:
|
|||
Description of the change
Updates the version of the NUnit used to run the tests so that they can work with the new runtime used.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
