Hello, I’ve resolved the conflicts here: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=mstanciu/merged_ui_tests
They should rebase over master with no issues. Please let us know if more changes are needed. Regards, Mihai From: Smith, Elliot [mailto:[email protected]] Sent: Monday, April 11, 2016 7:43 PM To: Mihail, StanciuX Cc: [email protected]; Hangan, ValentinX; Roman, Alexandru CostinX Subject: Re: [Toaster] [review-request]Fixed old UI tests Does this branch supersede vhangan/automated_toaster_ui_tests<http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=vhangan/automated_toaster_ui_tests> ? I tried to cherry pick the commits off vhangan/automated_toaster_ui_tests<http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=vhangan/automated_toaster_ui_tests> then the commits off vhangan/toaster_tests_fixed<http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=vhangan/toaster_tests_fixed>, but they conflict with each other. Thanks. Elliot On 8 April 2016 at 15:15, Mihail, StanciuX <[email protected]<mailto:[email protected]>> wrote: Hello, We’ve fixed the older UI tests to work with the latest changes to IDs. You can find the code here: http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=vhangan/toaster_tests_fixed Please let us know if anything needs updating. Regards, Mihai -- _______________________________________________ toaster mailing list [email protected]<mailto:[email protected]> https://lists.yoctoproject.org/listinfo/toaster -- Elliot Smith Software Engineer Intel Open Source Technology Centre
-- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
