Closed patRyserWelch8 closed 5 years ago
Hi @patRyserWelch8 - it looks like Paul has edited the getOpals.R since you checked it out, and there are conflicts with it. Can you check and confirm if your edits are compatible with his?
https://github.com/datashield/dsBetaTestClient/pull/39/conflicts
https://github.com/datashield/dsBetaTestClient/pull/39/files#diff-bbb605cefda3fda56bdd3a1251ccd47b
@StuartWheater - I've asked @patRyserWelch8 to merge her tests in to master. We have some conflicts with the testthat/setup.R file. Can you look to see how best we can merge this in, keeping in mind the overall CI testing approach?
Hi
I will do that on Monday, once I have access to the right laptop.
P.
Dr Patricia Ryser-Welch
Start by doing what's necessary; then do what's possible; and suddenly you are doing the impossible.
Francis of Assisi
Mankind remains the most extraordinary computer of all....
John F. Kennedy
From: Olly Butters notifications@github.com Sent: 05 April 2019 17:52 To: datashield/dsBetaTestClient Cc: P.Ryser-Welch; Assign Subject: Re: [datashield/dsBetaTestClient] As agree with Olly on the 21/03/2019 (#39)
@OllyButters requested changes on this pull request.
there is a
/testthat/testthat/
directory that contains much of the content of
/testthat/
as a duplicate. Please delete the extra directory.
— You are receiving this because you were assigned. Reply to this email directly, view it on GitHubhttps://github.com/datashield/dsBetaTestClient/pull/39#pullrequestreview-223378388, or mute the threadhttps://github.com/notifications/unsubscribe-auth/ArUYvmDT-VSd_Ln217T-NMp9TQabrxlgks5vd39OgaJpZM4cDQjX.
This is the test that framework. It will be integrated with Stuart and Olly continuous integration.