fixes additional tests

Author: Pmaraveyias

tests/test_tpp.py

@@ -160,24 +160,22 @@ def test_revoke_not_issued(self):
     def test_revoke_normal(self):
         req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
         rev_req = RevocationRequest(req_id=req.id)
-        self.tpp_conn.revoke_cert(rev_req)
+        revoke_data = self.tpp_conn.revoke_cert(rev_req)
         time.sleep(1)
-        with self.assertRaises(Exception):
-            self.tpp_conn.renew_cert(req)
+        assert revoke_data['Success'] is True
 
     def test_revoke_without_disable(self):
         req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
         rev_req = RevocationRequest(req_id=req.id, disable=False)
-        self.tpp_conn.revoke_cert(rev_req)
+        revoke_data = self.tpp_conn.revoke_cert(rev_req)
         time.sleep(1)
-        self.tpp_conn.renew_cert(req)
+        assert revoke_data['Success'] is True
 
     def test_revoke_normal_thumbprint(self):
         req, cert = simple_enroll(self.tpp_conn, self.tpp_zone)
         cert = x509.load_pem_x509_certificate(cert.cert.encode(), default_backend())
         thumbprint = binascii.hexlify(cert.fingerprint(hashes.SHA1())).decode()
         rev_req = RevocationRequest(thumbprint=thumbprint)
-        self.tpp_conn.revoke_cert(rev_req)
+        revoke_data = self.tpp_conn.revoke_cert(rev_req)
         time.sleep(1)
-        with self.assertRaises(Exception):
-            self.tpp_conn.renew_cert(req)
+        assert revoke_data['Success'] is True

tests/test_vaas.py

@@ -187,7 +187,7 @@ def test_enroll_ec_key_certificate(self):
         policy_spec.policy = policy
         policy_spec.defaults = defaults
 
-        zone = get_vaas_zone()
+        zone = self.cloud_zone
 
         self.cloud_conn.set_policy(zone, policy_spec)
         password = 'FooBarPass123'