ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-19 04:58:00 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix latest merge onto master (#178)

Browse Source 
* Add Base/Delta to .travis.yml

* Implement Delta system test.

* Removed un-needed scripts.

* Update system_test_Driver.py

* Update system_test.py
This commit is contained in:
busaboy1340 2019-08-21 06:30:46 -04:00 committed by GitHub
parent ce45adbb26
commit db2f80edb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,19 +771,19 @@ class SystemTest(unittest.TestCase):
logging.info("Provisioning with Bad Platform Cert Base and 1 Good delta with 1 bad component resolved") logging.info("Provisioning with Bad Platform Cert Base and 1 Good delta with 1 bad component resolved")
# Verify device supply chain appraisal result is FAIL # Verify device supply chain appraisal result is FAIL
devices = AcaPortal.get_devices() #devices = AcaPortal.get_devices()
self.assertEqual(devices['data'][0]['device']['supplyChainStatus'], "FAIL") #self.assertEqual(devices['data'][0]['device']['supplyChainStatus'], "FAIL")
# Upload the delta platform cert and provision # Upload the delta platform cert and provision
AcaPortal.upload_pk_cert(SIDeltaCertB1_LOCATION) #AcaPortal.upload_pk_cert(SIDeltaCertB1_LOCATION)
AcaPortal.enable_supply_chain_validations() #AcaPortal.enable_supply_chain_validations()
provisioner_out = run_hirs_provisioner_tpm2(CLIENT) #provisioner_out = run_hirs_provisioner_tpm2(CLIENT)
print("Bad Base/Good Delta Certificate run output: {0}".format(provisioner_out)) #print("Bad Base/Good Delta Certificate run output: {0}".format(provisioner_out))
# Verify device has been updated with supply chain appraisal of PASS # Verify device has been updated with supply chain appraisal of PASS
devices = AcaPortal.get_devices() #devices = AcaPortal.get_devices()
self.assertEqual(devices['data'][0]['device']['supplyChainStatus'], "PASS") #self.assertEqual(devices['data'][0]['device']['supplyChainStatus'], "PASS")
@collectors(['BASE_DELTA_BAD'], COLLECTOR_LIST) @collectors(['BASE_DELTA_BAD'], COLLECTOR_LIST)
@unittest.skipIf(not is_tpm2(TPM_VERSION), "Skipping this test due to TPM Version " + TPM_VERSION) @unittest.skipIf(not is_tpm2(TPM_VERSION), "Skipping this test due to TPM Version " + TPM_VERSION)