Revise test qobj headers in result sims 87

test/ibmq/test_ibmq_backends.py

@@ -15,8 +15,7 @@
 
 """Tests for all IBMQ backends."""
 
-from unittest import skip, expectedFailure
-
+from unittest import skip
 from qiskit import ClassicalRegister, QuantumCircuit, QuantumRegister
 from qiskit.providers.exceptions import QiskitBackendNotFoundError
 from qiskit.providers.ibmq import IBMQ
@@ -92,7 +91,6 @@ def test_remote_backend_defaults(self, qe_token, qe_url):
         for backend in remotes:
             _ = backend.defaults()
 
-    @expectedFailure
     @requires_qe_access
     def test_qobj_headers_in_result_sims(self, qe_token, qe_url):
         """Test that the qobj headers are passed onto the results for sims."""
@@ -105,11 +103,9 @@ def test_qobj_headers_in_result_sims(self, qe_token, qe_url):
             with self.subTest(backend=backend):
                 circuits = transpile(self.qc1, backend=backend)
 
+                qobj = assemble(circuits, backend=backend)
                 # Update the Qobj header.
-                qobj_header = QobjHeader.from_dict(custom_qobj_header)
-                # TODO: assemble appends extra keys to the header in terra 0.8.
-                qobj = assemble(circuits, backend=backend,
-                                qobj_header=qobj_header)
+                qobj.header = QobjHeader.from_dict(custom_qobj_header)
                 qobj.experiments[0].header.some_field = 'extra info'
 
                 result = backend.run(qobj).result()
@@ -128,8 +124,9 @@ def test_qobj_headers_in_result_devices(self, qe_token, qe_url):
 
         for backend in backends:
             with self.subTest(backend=backend):
-                qobj = transpile(self.qc1, backend=backend)
+                circuits = transpile(self.qc1, backend=backend)
 
+                qobj = assemble(circuits, backend=backend)
                 # Update the Qobj header.
                 qobj.header = QobjHeader.from_dict(custom_qobj_header)
                 # Update the Qobj.experiment header.