fix rebase

Signed-off-by: Ian Eaves <[email protected]>

Author: ieaves

test/e2e/conftest.py

@@ -3,6 +3,7 @@
 import shutil
 import string
 import subprocess
+import sys
 import time
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -13,6 +14,10 @@
 import pytest
 import requests
 
+if sys.byteorder == "big":
+    # Most tests assume little-endian so need to disable endianness verification on big-endian systems
+    os.environ["RAMALAMA_VERIFY"] = "false"
+
 
 @dataclass
 class Registry:

test/e2e/test_help.py

@@ -87,6 +87,7 @@ def test_help_output(subcommand):
 @pytest.mark.parametrize("command", ["run", "bench", "serve"], ids=lambda x: f"ramalama {x}")
 def test_default_image(monkeypatch, command):
     monkeypatch.delenv("RAMALAMA_DEFAULT_IMAGE", raising=False)
+    monkeypatch.delenv("RAMALAMA_IMAGES", raising=False)
     result = check_output(["ramalama", command, "--help"])
     match = DEFAULT_IMAGE_PATTERN.search(result.replace("\n", ""))
 

test/e2e/test_info.py

@@ -14,6 +14,7 @@
 @skip_if_gh_actions_darwin
 def test_info(monkeypatch, container_engine):
     monkeypatch.delenv("RAMALAMA_DEFAULT_IMAGE", raising=False)
+    monkeypatch.delenv("RAMALAMA_IMAGES", raising=False)
     info = json.loads(check_output(["ramalama", "info"]))
 
     assert info["Image"].startswith("quay.io/ramalama/")

test/e2e/test_inspect.py

@@ -1,6 +1,5 @@
 import json
 import re
-import sys
 from subprocess import STDOUT, CalledProcessError
 from test.e2e.utils import RamalamaExecWorkspace
 
@@ -37,9 +36,7 @@ def test_inspect_non_existent_model(shared_ctx):
         pytest.param(GGUF_MODEL, False, ["Registry"], "ollama", id="gguf_inspect_registry"),
         pytest.param(GGUF_MODEL, False, ["Format"], "GGUF", id="gguf_inspect_format"),
         pytest.param(GGUF_MODEL, False, ["Version"], "3", id="gguf_inspect_version"),
-        pytest.param(
-            GGUF_MODEL, False, ["Endianness"], "0" if sys.byteorder == "little" else "1", id="gguf_inspect_endianness"
-        ),
+        pytest.param(GGUF_MODEL, False, ["Endianness"], "0", id="gguf_inspect_endianness"),
         pytest.param(GGUF_MODEL, False, ["Metadata"], "23", id="gguf_inspect_metadata_count"),
         pytest.param(GGUF_MODEL, False, ["Tensors"], "201", id="gguf_inspect_tensors_count"),
         pytest.param(
@@ -62,7 +59,7 @@ def test_inspect_non_existent_model(shared_ctx):
             GGUF_MODEL,
             True,
             ["Endianness"],
-            "0" if sys.byteorder == "little" else "1",
+            "0",
             id="gguf_inspect_all_endianness",
         ),
         pytest.param(

test/e2e/test_serve.py

@@ -770,10 +770,8 @@ def test_serve_with_rag():
     with RamalamaExecWorkspace() as ctx:
         result_a = ctx.check_output(RAMALAMA_DRY_RUN + ["--rag", "quay.io/ramalama/rag", "--pull", "never", "tiny"])
         assert re.search(r".*llama-server", result_a)
-        assert re.search(r".*--port 8081", result_a)
         assert re.search(r".*quay.io/.*-rag(@sha256)?:", result_a)
         assert re.search(r".*rag_framework serve", result_a)
-        assert re.search(r".*--port 8080", result_a)
         assert re.search(r".*--mount=type=image,source=quay.io/ramalama/rag,destination=/rag,rw=true", result_a)
 
         result_b = ctx.check_output(