test: remove redundant test & use wait_for_active

Author: yanksyoon

tests/integration/test_machine.py

@@ -39,37 +39,9 @@ async def test_status():
             timeout=480)
 
 
-@base.bootstrapped
-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(
-            model.block_until(lambda: model.machines),
-            timeout=240)
-        machine = model.machines['0']
-        await asyncio.wait_for(
-            model.block_until(lambda: (machine.status == 'running' and
-                                       machine.agent_status == 'started')),
-            timeout=480)
-
-        with NamedTemporaryFile() as f:
-            f.write(b'testcontents')
-            f.flush()
-            await machine.scp_to(f.name, 'testfile', scp_opts='-p')
-
-        with NamedTemporaryFile() as f:
-            await machine.scp_from('testfile', f.name, scp_opts='-p')
-            assert f.read() == b'testcontents'
-
-
 async def test_machine_ssh():
     async with base.CleanModel() as model:
         machine: Machine = await model.add_machine()
-        out = await machine.ssh("echo hello world!")
+        out = await machine.ssh("echo hello world!", wait_for_active=True)
 
         assert out == "hello world!\n"