On 27 November 2015 at 12:09, Mihail, StanciuX <[email protected]> wrote:
> I’ve rebased my patch: > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=mstanciu/toaster-ui-tests-fix&id=66da2599adaa469ba6f6737a2600a00363b07ee0 I just wanted to check: you have two files on that branch: bitbake/lib/toaster/contrib/tts/toasteruitest/toaster.sqlite bitbake/lib/toaster/contrib/tts/toasteruitest/toasterconf.json (these are added by commit 66da2599adaa469ba6f6737a2600a00363b07ee0 ; I have to merge this commit, as it contains changes to bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py which are needed to enable me to merge 0f2872d36d09fd7484eed6c969d6e5287ea9a950) Do you want these two files (toasterconf.json and toaster.sqlite) merged too? Elliot > > > Regards, > Mihai > > From: Smith, Elliot [mailto:[email protected]] > Sent: Thursday, November 26, 2015 7:01 PM > To: Mihail, StanciuX > Cc: [email protected] > Subject: Re: [Toaster] [review request] Update UI tests to work with 2.0 > changes > > Hell Mihail. > > On 25 November 2015 at 10:02, Mihail, StanciuX <[email protected] > <mailto:[email protected]>> wrote: > Changes can be found here: > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=mstanciu/toaster-ui-tests-fix&id=7296d1c7367e62a5e72fcbae8dd4b5c00c2bc7f4 > > This doesn't merge cleanly with toaster-next (it clashes on > bitbake/lib/toaster/contrib/tts/toasteruitest/toaster_automation_test.py). > > Could you please rebase and fix the conflicts, then I'll test again. > > Thanks. > Elliot > > > Feedback would be appreciated. > > Cheers, > Mihai > > -- > _______________________________________________ > toaster mailing list > [email protected]<mailto:[email protected]> > https://lists.yoctoproject.org/listinfo/toaster > > > > -- > Elliot Smith > Software Engineer > Intel Open Source Technology Centre > -- Elliot Smith Software Engineer Intel Open Source Technology Centre
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
