removed unnecessary env vars

jobs/v4beta1/job_search_autocomplete_job_title_test.py

@@ -17,10 +17,9 @@
 import job_search_autocomplete_job_title
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
 
 
-def test_autocomplete_job_title(capsys):
-    job_search_autocomplete_job_title.complete_query(PROJECT_ID, TENANT_ID, "Software")
+def test_autocomplete_job_title(capsys, tenant):
+    job_search_autocomplete_job_title.complete_query(PROJECT_ID, tenant, "Software")
     out, _ = capsys.readouterr()
     assert "Suggested title:" in out

jobs/v4beta1/job_search_create_company_test.py

@@ -21,14 +21,13 @@
 import job_search_delete_company
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
 COMPANY_EXT_ID = "COMPANY_EXT_ID_{}".format(uuid.uuid4())
 
 
-def test_create_company(capsys, cleaner):
+def test_create_company(capsys, tenant, cleaner):
     # create company
     company_name = job_search_create_company.create_company(
-        PROJECT_ID, TENANT_ID, "Test Company Name", COMPANY_EXT_ID
+        PROJECT_ID, tenant, "Test Company Name", COMPANY_EXT_ID
     )
     out, _ = capsys.readouterr()
     assert "Created" in out
@@ -40,10 +39,10 @@ def test_create_company(capsys, cleaner):
 
 
 @pytest.fixture(scope="module")
-def cleaner():
+def cleaner(tenant):
     companies = []
 
     yield companies
 
     for company_id in companies:
-        job_search_delete_company.delete_company(PROJECT_ID, TENANT_ID, company_id)
+        job_search_delete_company.delete_company(PROJECT_ID, tenant, company_id)

jobs/v4beta1/job_search_create_job_custom_attributes_test.py

@@ -21,14 +21,12 @@
 import job_search_delete_job
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
-COMPANY_ID = os.environ["JOB_SEARCH_COMPANY_ID"]
 JOB_EXT_UNIQUE_ID = "TEST_JOB_{}".format(uuid.uuid4())
 
 
-def test_create_job_with_attributes(capsys, cleaner):
+def test_create_job_with_attributes(capsys, tenant, company, cleaner):
     job_name = job_search_create_job_custom_attributes.create_job(
-        PROJECT_ID, TENANT_ID, COMPANY_ID, JOB_EXT_UNIQUE_ID
+        PROJECT_ID, tenant, company, JOB_EXT_UNIQUE_ID
     )
     out, _ = capsys.readouterr()
     assert "Created job:" in out
@@ -39,10 +37,10 @@ def test_create_job_with_attributes(capsys, cleaner):
 
 
 @pytest.fixture(scope="module")
-def cleaner():
+def cleaner(tenant):
     jobs = []
 
     yield jobs
 
     for job_id in jobs:
-        job_search_delete_job.delete_job(PROJECT_ID, TENANT_ID, job_id)
+        job_search_delete_job.delete_job(PROJECT_ID, tenant, job_id)

jobs/v4beta1/job_search_create_job_test.py

@@ -21,15 +21,13 @@
 import job_search_delete_job
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
-COMPANY_ID = os.environ["JOB_SEARCH_COMPANY_ID"]
 JOB_EXT_UNIQUE_ID = "TEST_JOB_{}".format(uuid.uuid4())
 
 
-def test_create_job(capsys, cleaner):
+def test_create_job(capsys, tenant, company, cleaner):
     # create a job
     job_name = job_search_create_job.create_job(
-        PROJECT_ID, TENANT_ID, COMPANY_ID, JOB_EXT_UNIQUE_ID, "www.example.com"
+        PROJECT_ID, tenant, company, JOB_EXT_UNIQUE_ID, "www.example.com"
     )
     out, _ = capsys.readouterr()
     assert "Created job:" in out
@@ -40,10 +38,10 @@ def test_create_job(capsys, cleaner):
 
 
 @pytest.fixture(scope="module")
-def cleaner():
+def cleaner(tenant):
     jobs = []
 
     yield jobs
 
     for job_id in jobs:
-        job_search_delete_job.delete_job(PROJECT_ID, TENANT_ID, job_id)
+        job_search_delete_job.delete_job(PROJECT_ID, tenant, job_id)

jobs/v4beta1/job_search_delete_company_test.py

@@ -23,15 +23,14 @@
 import job_search_delete_company
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
 COMPANY_EXT_ID = "COMPANY_EXT_ID_{}".format(uuid.uuid4())
 
 
 @pytest.fixture(scope="module")
-def company():
+def company(tenant):
     # create a temporary company
     company_name = job_search_create_company.create_company(
-        PROJECT_ID, TENANT_ID, "Test Company Name", COMPANY_EXT_ID
+        PROJECT_ID, tenant, "Test Company Name", COMPANY_EXT_ID
     )
 
     # extract company id
@@ -40,14 +39,14 @@ def company():
     yield company_id
 
     try:
-        job_search_delete_company.delete_company(PROJECT_ID, TENANT_ID, company)
+        job_search_delete_company.delete_company(PROJECT_ID, tenant, company)
     except NotFound as e:
         print("Ignoring NotFound upon cleanup, details: {}".format(e))
 
 
-def test_delete_company(capsys, company):
+def test_delete_company(capsys, tenant, company):
     out, _ = capsys.readouterr()
 
-    job_search_delete_company.delete_company(PROJECT_ID, TENANT_ID, company)
+    job_search_delete_company.delete_company(PROJECT_ID, tenant, company)
     out, _ = capsys.readouterr()
     assert "Deleted" in out

jobs/v4beta1/job_search_delete_job_test.py

@@ -23,16 +23,14 @@
 import job_search_delete_job
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
-COMPANY_ID = os.environ["JOB_SEARCH_COMPANY_ID"]
 POST_UNIQUE_ID = "TEST_POST_{}".format(uuid.uuid4())[:20]
 
 
 @pytest.fixture(scope="module")
-def job():
+def job(tenant, company):
     # create a temporary job
     job_name = job_search_create_job.create_job(
-        PROJECT_ID, TENANT_ID, COMPANY_ID, POST_UNIQUE_ID, "www.jobUrl.com"
+        PROJECT_ID, tenant, company, POST_UNIQUE_ID, "www.jobUrl.com"
     )
 
     # extract company id
@@ -41,12 +39,12 @@ def job():
     yield job_id
 
     try:
-        job_search_delete_job.delete_job(PROJECT_ID, TENANT_ID, job_id)
+        job_search_delete_job.delete_job(PROJECT_ID, tenant, job_id)
     except NotFound as e:
         print("Ignoring NotFound upon cleanup, details: {}".format(e))
 
 
-def test_delete_job(capsys, job):
-    job_search_delete_job.delete_job(PROJECT_ID, TENANT_ID, job)
+def test_delete_job(capsys, tenant, job):
+    job_search_delete_job.delete_job(PROJECT_ID, tenant, job)
     out, _ = capsys.readouterr()
     assert "Deleted" in out

jobs/v4beta1/job_search_get_tenant_test.py

@@ -18,7 +18,6 @@
 import job_search_get_tenant
 
 PROJECT_ID = os.environ["GOOGLE_CLOUD_PROJECT"]
-TENANT_ID = os.environ["JOB_SEARCH_TENANT_ID"]
 
 
 def test_get_tenant(capsys, tenant):