Message ID | 1454981015-21619-1-git-send-email-swarren@wwwdotorg.org |
---|---|
State | Accepted |
Commit | 06088b047325d23434e32f8dc881ca6c231da2b4 |
Delegated to: | Tom Rini |
Headers | show |
On 8 February 2016 at 18:23, Stephen Warren <swarren@wwwdotorg.org> wrote: > From: Stephen Warren <swarren@nvidia.com> > > The code replaced pexpect with custom code long ago. Don't import the > unused module so it doesn't need to be installed. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > test/py/conftest.py | 1 - > 1 file changed, 1 deletion(-) Acked-by: Simon Glass <sjg@chromium.org>
On Mon, Feb 08, 2016 at 06:23:34PM -0700, Stephen Warren wrote: > From: Stephen Warren <swarren@nvidia.com> > > The code replaced pexpect with custom code long ago. Don't import the > unused module so it doesn't need to be installed. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/test/py/conftest.py b/test/py/conftest.py index 7b97cbaa0eed..1ec096e24182 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -17,7 +17,6 @@ import atexit import errno import os import os.path -import pexpect import pytest from _pytest.runner import runtestprotocol import ConfigParser