Fixed incorrect changes from cherry-pick

PandABlocks · Aug 16, 2023 · b921eb1 · b921eb1
1 parent 1bd195e
commit b921eb1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/tests/fixtures/mocked_panda.py b/tests/fixtures/mocked_panda.py
@@ -49,7 +49,7 @@
 # Use the unique TEST_PREFIX to ensure this isn't a problem for future tests
 TEST_PREFIX = "TEST-PREFIX-" + str(uuid4())[:4].upper()
 BOBFILE_DIR = Path(__file__).parent.parent / "test-bobfiles"
-TIMEOUT = 1000
+TIMEOUT = 10
 
 
 @pytest_asyncio.fixture

diff --git a/tests/test-bobfiles/TOP.bob b/tests/test-bobfiles/TOP.bob
@@ -12,7 +12,7 @@
     <text>TOP - TEST-PREFIX:</text>
     <x use_class="true">0</x>
     <y use_class="true">0</y>
-    <width>10</width>
+    <width>278</width>
     <height>25</height>
     <font use_class="true">
       <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">

diff --git a/tests/test_ioc_system.py b/tests/test_ioc_system.py
@@ -330,15 +330,15 @@ async def test_create_softioc_record_update_send_to_panda(
     ) = mocked_panda_standard_responses
     try:
         trig_queue = asyncio.Queue()
-        m1 = camonitor(TEST_PREFIX + ":PCAP1:TRIG_EDGE", trig_queue.put, datatype=str)
+        m1 = camonitor(TEST_PREFIX + ":PCAP:TRIG_EDGE", trig_queue.put, datatype=str)
 
         # Wait for all the dummy changes to finish
         assert await asyncio.wait_for(trig_queue.get(), TIMEOUT) == "Falling"
         assert await asyncio.wait_for(trig_queue.get(), TIMEOUT) == "Either"
 
         # Verify the pv has been put to
         await caput(
-            TEST_PREFIX + ":PCAP1:TRIG_EDGE", "Falling", wait=True, timeout=TIMEOUT
+            TEST_PREFIX + ":PCAP:TRIG_EDGE", "Falling", wait=True, timeout=TIMEOUT
         )
         assert await asyncio.wait_for(trig_queue.get(), TIMEOUT) == "Falling"
     finally:

diff --git a/tests/test_tables.py b/tests/test_tables.py
@@ -196,7 +196,7 @@ async def test_create_softioc_table_update_send_to_panda(
     ) = mocked_panda_standard_responses
     try:
         trig_queue = asyncio.Queue()
-        m1 = camonitor(TEST_PREFIX + ":PCAP1:TRIG_EDGE", trig_queue.put, datatype=str)
+        m1 = camonitor(TEST_PREFIX + ":PCAP:TRIG_EDGE", trig_queue.put, datatype=str)
 
         # Wait for all the dummy changes to finish
         assert await asyncio.wait_for(trig_queue.get(), TIMEOUT) == "Falling"
@@ -205,7 +205,7 @@ async def test_create_softioc_table_update_send_to_panda(
     finally:
         m1.close()
 
-    await caput(TEST_PREFIX + ":SEQ1:TABLE:MODE", "EDIT", wait=True, timeout=TIMEOUT)
+    await caput(TEST_PREFIX + ":SEQ:TABLE:MODE", "EDIT", wait=True, timeout=TIMEOUT)
 
     await caput(
         TEST_PREFIX + ":SEQ:TABLE:REPEATS", [1, 1, 1, 1, 1], wait=True, timeout=TIMEOUT