Merge branch 'main' into update-binder-rust

mtreinish · Mar 4, 2022 · 9f91288 · 9f91288
2 parents 7c1dc79 + 0be2c44
commit 9f91288
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/qiskit/test/mock/backends/washington/conf_washington.json b/qiskit/test/mock/backends/washington/conf_washington.json
diff --git a/qiskit/test/mock/backends/washington/defs_washington.json b/qiskit/test/mock/backends/washington/defs_washington.json
diff --git a/qiskit/test/mock/backends/washington/fake_washington.py b/qiskit/test/mock/backends/washington/fake_washington.py
@@ -15,13 +15,14 @@
 """
 
 import os
-from qiskit.test.mock import fake_qasm_backend
+from qiskit.test.mock import fake_pulse_backend
 
 
-class FakeWashington(fake_qasm_backend.FakeQasmBackend):
+class FakeWashington(fake_pulse_backend.FakePulseBackend):
     """A fake 127 qubit backend."""
 
     dirname = os.path.dirname(__file__)
     conf_filename = "conf_washington.json"
     props_filename = "props_washington.json"
+    defs_filename = "defs_washington.json"
     backend_name = "fake_washington"
diff --git a/qiskit/test/mock/backends/washington/props_washington.json b/qiskit/test/mock/backends/washington/props_washington.json