ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-30 08:04:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up python imports. (#213)

Browse Source
This commit is contained in:
busaboy1340 2020-01-06 11:54:28 -05:00 committed by GitHub
parent 81e13831b2
commit 1c6947ca8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.ci/system-tests/system_test.py
View File

@ -3,24 +3,10 @@
# TODO: test_01-test_11 will need to be implemented when the additional HIRS # TODO: test_01-test_11 will need to be implemented when the additional HIRS
# projects are imported to the new GitHub repo. The test code is commented out for now. # projects are imported to the new GitHub repo. The test code is commented out for now.
import binascii
from ConfigParser import SafeConfigParser
import datetime
import json
import os
import shlex
import subprocess
import unittest
import re
import requests
import logging import logging
import pprint import os
import hashlib
import random
import uuid
import time
import sys import sys
import argparse import unittest
import urllib3 import urllib3
from system_test_core import HIRSPortal, AttestationCAPortal, collectors, \ from system_test_core import HIRSPortal, AttestationCAPortal, collectors, \
@ -82,7 +68,6 @@ logging.info("The ACA Portal is: " + HIRS_ATTESTATION_CA_PORTAL_URL)
Portal = HIRSPortal(HIRS_SERVER_URL) Portal = HIRSPortal(HIRS_SERVER_URL)
AcaPortal = AttestationCAPortal(HIRS_ATTESTATION_CA_PORTAL_URL) AcaPortal = AttestationCAPortal(HIRS_ATTESTATION_CA_PORTAL_URL)
#requests.packages.urllib3.disable_warnings()
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
class SystemTest(unittest.TestCase): class SystemTest(unittest.TestCase):
@ -620,12 +605,12 @@ class SystemTest(unittest.TestCase):
# self.assertTrue(run_hirs_report(CLIENT)) # self.assertTrue(run_hirs_report(CLIENT))
# self.assertEqual(Portal.get_alert_count_from_latest_report(), 0) # self.assertEqual(Portal.get_alert_count_from_latest_report(), 0)
# @collectors(['TPM'], COLLECTOR_LIST) @collectors(['TPM'], COLLECTOR_LIST)
# @unittest.skipIf(not is_tpm_1_2(TPM_VERSION), "Skipping this test due to TPM Version " + TPM_VERSION) @unittest.skipIf(not is_tpm_1_2(TPM_VERSION), "Skipping this test due to TPM Version " + TPM_VERSION)
# def test_13_tpm_1_2_initial_provision(self): def test_13_tpm_1_2_initial_provision(self):
# """Test that running the TPM 1.2 hirs provisioner works""" """Test that running the TPM 1.2 hirs provisioner works"""
# logging.info("***************** Beginning of initial TPM 1.2 provisioner run *****************") logging.info("***************** Beginning of initial TPM 1.2 provisioner run *****************")
#
# # Run the provisioner to ensure that it provisions successfully # # Run the provisioner to ensure that it provisions successfully
# provisioner_out = run_hirs_provisioner_tpm_1_2(CLIENT) # provisioner_out = run_hirs_provisioner_tpm_1_2(CLIENT)
# print("Initial TPM 1.2 provisioner run output: {0}".format(provisioner_out)) # print("Initial TPM 1.2 provisioner run output: {0}".format(provisioner_out))