Merge branch 'staging' into tests/zyzniewski/test_set_weights

Author: zyzniewski-reef

.github/workflows/e2e-subtensor-tests.yaml

@@ -49,10 +49,10 @@ jobs:
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
 
       - name: Pull Docker Image
-        run: docker pull ghcr.io/opentensor/subtensor-localnet:latest
+        run: docker pull ghcr.io/opentensor/subtensor-localnet:devnet-ready
 
       - name: Save Docker Image to Cache
-        run: docker save -o subtensor-localnet.tar ghcr.io/opentensor/subtensor-localnet:latest
+        run: docker save -o subtensor-localnet.tar ghcr.io/opentensor/subtensor-localnet:devnet-ready
 
       - name: Upload Docker Image as Artifact
         uses: actions/upload-artifact@v4

tests/e2e_tests/conftest.py

@@ -18,6 +18,14 @@
     Templates,
     setup_wallet,
 )
+import logging
+
+logging.basicConfig(
+    format="%(asctime)s %(message)s",
+    level=logging.DEBUG,
+)
+
+LOCALNET_IMAGE_NAME = "ghcr.io/opentensor/subtensor-localnet:devnet-ready"
 
 
 def wait_for_node_start(process, timestamp=None):
@@ -43,7 +51,9 @@ def wait_for_node_start(process, timestamp=None):
     # To prevent the buffer filling up
     def read_output():
         while True:
-            if not process.stdout.readline():
+            line = process.stdout.readline()
+
+            if not line:
                 break
 
     reader_thread = threading.Thread(target=read_output, daemon=True)
@@ -132,6 +142,7 @@ def is_docker_running():
                 stderr=subprocess.DEVNULL,
                 check=True,
             )
+            subprocess.run(["docker", "pull", LOCALNET_IMAGE_NAME], check=True)
             return True
         except subprocess.CalledProcessError:
             return False
@@ -141,6 +152,7 @@ def try_start_docker():
         try:
             subprocess.run(["open", "-a", "Docker"], check=True)  # macOS
         except (FileNotFoundError, subprocess.CalledProcessError):
+            return True
             try:
                 subprocess.run(["systemctl", "start", "docker"], check=True)  # Linux
             except (FileNotFoundError, subprocess.CalledProcessError):
@@ -162,7 +174,6 @@ def try_start_docker():
         return False
 
     container_name = f"test_local_chain_{str(time.time()).replace(".", "_")}"
-    image_name = "ghcr.io/opentensor/subtensor-localnet:devnet-ready"
 
     # Command to start container
     cmds = [
@@ -175,7 +186,7 @@ def try_start_docker():
         "9944:9944",
         "-p",
         "9945:9945",
-        image_name,
+        LOCALNET_IMAGE_NAME,
         params,
     ]
 

tests/e2e_tests/test_set_weights.py

@@ -113,14 +113,14 @@ async def test_set_weights_uses_next_nonce(local_chain, subtensor, alice_wallet)
             netuid,
             uids=weight_uids,
             weights=weight_vals,
-            wait_for_inclusion=True,  # Don't wait for inclusion, we are testing the nonce when there is a tx in the pool
+            wait_for_inclusion=False,  # Don't wait for inclusion, we are testing the nonce when there is a tx in the pool
             wait_for_finalization=False,
         )
 
         assert success is True, message
 
     # Wait for the txs to be included in the chain
-    await wait_epoch(subtensor, netuid=netuids[-1], times=4)
+    await wait_epoch(subtensor, netuid=netuids[-1], times=2)
 
     for netuid in netuids:
         # Query the Weights storage map for all three subnets