Test expand_calibrations respects order

pyquil/api/tests/test_compiler.py

@@ -232,7 +232,43 @@ def test_compile_with_quilt_calibrations(compiler):
     assert compilation_result == program
 
 
-def test_expand_calibrations():
+# TODO(notmgsk): Is this sufficient coverage?
+@pytest.mark.parametrize(
+    "calibrations_program_text,user_program_text",
+    [
+        (
+            """
+DEFCAL I 0:
+    SHIFT-PHASE 0 "rz" 1.0
+""",
+            "I 0",
+        ),
+        (
+            """
+DEFCAL I 0:
+    SHIFT-PHASE 0 "rz" 2.0
+""",
+            """
+DEFCAL I 0:
+    SHIFT-PHASE 0 "rz" 1.0
+
+I 0""",
+        ),
+        (
+            """
+DEFCAL I 0:
+    SHIFT-PHASE 0 "rz" 2.0
+""",
+            """
+I 0
+
+DEFCAL I 0:
+    SHIFT-PHASE 0 "rz" 1.0
+""",
+        ),
+    ],
+)
+def test_expand_calibrations_order(calibrations_program_text, user_program_text):
     device_name = "test_device"
     mock_url = "http://mock-qpu-compiler"
 
@@ -263,15 +299,13 @@ def test_expand_calibrations():
         device=device,
         session=session,
     )
-    calibrations_program = Program(
-        """
-DEFCAL I 0:
-    SHIFT-PHASE 0 "rz" 1.0
-""")
+    calibrations_program = Program(calibrations_program_text)
     compiler._calibrations = calibrations_program.calibrations
 
-    program = Program("I 0")
+    program = Program(user_program_text)
     calibrated_program = compiler.expand_calibrations(program)
     assert calibrated_program == Program('SHIFT-PHASE 0 "rz" 1.0')
     calibrated_program = compiler.expand_calibrations(program, discard_defcals=False)
-    assert calibrated_program == calibrations_program + Program('SHIFT-PHASE 0 "rz" 1.0')
+    assert calibrated_program == calibrations_program + Program(program.calibrations) + Program(
+        'SHIFT-PHASE 0 "rz" 1.0'
+    )