New N2VC interface + updated libjuju

[osm/N2VC.git] / modules / libjuju / tests / integration / test_machine.py

diff --git a/modules/libjuju/tests/integration/test_machine.py b/modules/libjuju/tests/integration/test_machine.py
index cabf46d..8957ae1 100644 (file)
--- a/modules/libjuju/tests/integration/test_machine.py
+++ b/modules/libjuju/tests/integration/test_machine.py
@@ -1,8 +1,8 @@
 import asyncio
 import asyncio

-import pytest
-

 from tempfile import NamedTemporaryFile
 
 from tempfile import NamedTemporaryFile
 

+import pytest
+

 from .. import base
 
 
 from .. import base
 
 


@@ -42,6 +42,11 @@ async def test_status(event_loop):
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_scp(event_loop):
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_scp(event_loop):

+    # ensure that asyncio.subprocess will work;
+    try:
+        asyncio.get_child_watcher().attach_loop(event_loop)
+    except RuntimeError:
+        pytest.skip('test_scp will always fail outside of MainThread')

     async with base.CleanModel() as model:
         await model.add_machine()
         await asyncio.wait_for(
     async with base.CleanModel() as model:
         await model.add_machine()
         await asyncio.wait_for(