Merge pull request #715 from alfrunes/acceptance-fixup

Acceptance test fixup

tests/common.py

@@ -153,13 +153,14 @@ def explode_jwt(token):
 
 
 @pytest.fixture(scope="session")
-def cli():
-    return CliClient()
+def cli(request):
+    service = request.config.getoption("host").split(":")[0]
+    return CliClient(service)
 
 
 @pytest.fixture(scope="session")
-def mongo():
-    return MongoClient("mender-mongo:27017")
+def mongo(request):
+    return MongoClient(request.config.getoption("mongo_url"))
 
 
 def mongo_cleanup(mongo):
@@ -185,13 +186,6 @@ def clean_migrated_db(clean_db, cli):
     yield clean_db
 
 
-@pytest.fixture(scope="function")
-def tenant_foobar_clean_migrated_db(clean_db, cli):
-    """Clean 'foobar' database with migrations applied. Yields pymongo.MongoClient connected to the DB."""
-    cli.migrate(tenant="foobar")
-    yield clean_db
-
-
 @pytest.fixture(scope="session")
 def management_api(request):
     yield SimpleManagementClient(
@@ -231,14 +225,6 @@ def make_fake_tenant_token(tenant):
     return "fake." + enc + ".fake-sig"
 
 
-@pytest.fixture
-def tenant_foobar(request, tenant_foobar_clean_migrated_db):
-    """Fixture that sets up a tenant with ID 'foobar', on top of a clean migrated
-    (with tenant support) DB.
-    """
-    return make_fake_tenant_token("foobar")
-
-
 def make_devices(device_api, devcount=1, tenant_token=""):
     url = device_api.auth_requests_url
 
@@ -269,29 +255,6 @@ def devices(device_api, clean_migrated_db, request):
     yield make_devices(device_api, devcount)
 
 
-@pytest.fixture(scope="function")
-def tenant_foobar_devices(device_api, management_api, tenant_foobar, request):
-    """Make unauthorized devices owned by tenant with ID 'foobar'. The fixture can
-    be parametrized a number of devices to make. Yields a list of tuples:
-    (instance of Device, instance of DevAuthorizer)
-    """
-    handlers = [
-        (
-            "POST",
-            "/api/internal/v1/tenantadm/tenants/verify",
-            lambda _: (200, {}, '{"id": "foobar", "plan": "os"}'),
-        ),
-    ]
-    with mockserver.run_fake(get_fake_tenantadm_addr(), handlers=handlers) as fake:
-
-        if not hasattr(request, "param"):
-            devcount = 1
-        else:
-            devcount = int(request.param)
-
-        yield make_devices(device_api, devcount, tenant_token=tenant_foobar)
-
-
 def get_fake_tenantadm_addr():
     return os.environ.get("FAKE_TENANTADM_ADDR", "0.0.0.0:9999")
 

tests/conftest.py

@@ -14,22 +14,25 @@
 #    limitations under the License.
 import logging
 
+
 def pytest_addoption(parser):
-    parser.addoption("--host", action="store", default="localhost",
-                     help="host running API")
+    parser.addoption(
+        "--host", action="store", default="deviceauth", help="host running API"
+    )
+    parser.addoption(
+        "--mongo-url",
+        default="mongodb://mongo",
+        help="The MongoDB URL (connection string)",
+    )
     parser.addoption("--spec", default="../docs/internal_api.yml")
     parser.addoption("--management-spec", default="../docs/management_api.yml")
 
+
 def pytest_configure(config):
     lvl = logging.INFO
     if config.getoption("verbose"):
         lvl = logging.DEBUG
     logging.basicConfig(level=lvl)
     # configure bravado related loggers to be less verbose
-    logging.getLogger('swagger_spec_validator').setLevel(logging.INFO)
-    logging.getLogger('bravado_core').setLevel(logging.INFO)
-    host = config.getoption("host")
-    if not host:
-        print("you didn't pass all of the required arguments")
-        print(host)
-        sys.exit(1)
+    logging.getLogger("swagger_spec_validator").setLevel(logging.INFO)
+    logging.getLogger("bravado_core").setLevel(logging.INFO)

tests/run.sh

@@ -29,6 +29,7 @@ HOST=${HOST="mender-device-auth:8080"}
 }
 
 py.test -s --tb=short --host $HOST \
+	  --mongo-url "mongodb://mender-mongo" \
           --spec $DIR/internal_api.yml \
           --management-spec $DIR/management_api.yml \
           --verbose --junitxml=$DIR/results.xml \

tests/tests/client.py

@@ -249,7 +249,7 @@ def find_device_by_identity(self, identity, **kwargs):
 class CliClient:
     exec_path = "/usr/bin/deviceauth"
 
-    def __init__(self):
+    def __init__(self, service="deviceauth"):
         self.docker = docker.from_env()
         _self = self.docker.containers.list(filters={"id": socket.gethostname()})[0]
 
@@ -258,7 +258,7 @@ def __init__(self):
             filters={
                 "label": [
                     f"com.docker.compose.project={project}",
-                    "com.docker.compose.service=mender-device-auth",
+                    f"com.docker.compose.service={service}",
                 ]
             },
             limit=1,