Skip to contentSkip to conversation

oe-selftest: devtool: fix test_devtool_add hanging on some machines

PATCH New Paul Eggleton 1 participant 2 messages Sep 13, 2017

lore
Share & tools
lore
#0 lore raw

cover oe-selftest: devtool: fix test_devtool_add hanging on some machines

The following changes since commit de70799af1a8bfe2fac22b90401053275d4714ba:

image_types: support lz4 compressed squashfs (2017-09-12 23:54:43 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/devtool-edit-recipe-selftest-fix
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/devtool-edit-recipe-selftest-fix

Paul Eggleton (1):
oe-selftest: devtool: fix test_devtool_add hanging on some machines

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.9.5
#1 lore raw

PATCH 1/1 oe-selftest: devtool: fix test_devtool_add hanging on some machines

The code in scriptutils which implements the logic for running the editor used by devtool edit-recipe looks at the VISUAL environment variable before EDITOR, and thus if VISUAL is set in the environment it will override the EDITOR value we are setting here, the editor (usually vim) launches and there's nothing to stop it running forever short of manually killing it. Set VISUAL instead to fix this.

Apparently VISUAL is in fact the variable we should really be preferring here - I don't think I knew that but somehow I got it right in the code, just not in the test. Here are the details for the curious:

https://unix.stackexchange.com/questions/4859/visual-vs-editor-whats-the-difference

Fixes [YOCTO #12074].

---
 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/devtool.py +1 -1
index d5d0918..1dfef59 100644
@@ -216,7 +216,7 @@ class DevtoolTests(DevtoolBase):
         result = runCmd('devtool -q find-recipe %s' % pn)
         self.assertEqual(recipepath, result.output.strip())
         # Test devtool edit-recipe
-        result = runCmd('EDITOR="echo 123" devtool -q edit-recipe %s' % pn)
+        result = runCmd('VISUAL="echo 123" devtool -q edit-recipe %s' % pn)
         self.assertEqual('123 %s' % recipepath, result.output.strip())
         # Clean up anything in the workdir/sysroot/sstate cache (have to do this *after* devtool add since the recipe only exists then)
         bitbake('%s -c cleansstate' % pn)
Signature · 1 line
2.9.5