Renamed test_basic_e2e to test_client_e2e; added skeleton of cli e2e …

…tests; restructured teosd setup fixtures to be reusable

teos/cli/rpc_client.py

@@ -44,8 +44,8 @@ class RPCClient:
     Errors from the grpc calls are not handled.
 
     Args:
-        rpc_host (:obj:`str`): the IP or host where the RPC server will be hosted.
-        rpc_port (:obj:`int`): the port where the RPC server will be hosted.
+        rpc_host (:obj:`str`): the IP or host where the RPC server is hosted.
+        rpc_port (:obj:`int`): the port where the RPC server is hosted.
 
     Attributes:
         stub: The rpc client stub.

test/teos/conftest.py

@@ -35,21 +35,30 @@ def prng_seed():
     random.seed(0)
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="module")
 def run_bitcoind(dirname=".test_bitcoin"):
+    global btc_addr, utxos
     # Run bitcoind in a separate folder
     makedirs(dirname, exist_ok=True)
 
     bitcoind = os.getenv("BITCOIND", "bitcoind")
 
     copy(os.path.join(os.path.dirname(__file__), "bitcoin.conf"), dirname)
-    subprocess.Popen([bitcoind, f"--datadir={dirname}"])
+
+    bitcoind_popen = subprocess.Popen([bitcoind, f"--datadir={dirname}"])
 
     # Generate some initial blocks
     setup_node()
     yield
 
     bitcoin_cli.stop()
+    bitcoind_popen.wait()
+    sleep(1)
+
+    # cleanup global variables in case we do another run later
+    btc_addr = None
+    utxos = list()
+
     rmtree(dirname)
 
 

test/teos/e2e/conftest.py

@@ -15,8 +15,8 @@
 
 
 # This fixture needs to be manually run on the first E2E.
-@pytest.fixture(scope="session")
-def teosd():
+@pytest.fixture(scope="module")
+def teosd(run_bitcoind):
     teosd_process, teos_id = run_teosd()
 
     yield teosd_process, teos_id

test/teos/e2e/test_cli_e2e.py

@@ -0,0 +1,11 @@
+import pytest
+
+from contrib.client import teos_client
+
+from teos.cli.teos_cli import CLI
+from teos.cli.rpc_client import RPCClient
+
+
+def test_start_teosd(teosd):
+    # All commands should fail if the user is not registered
+    teosd_process, teos_id = teosd