Updating build script and github workflow to get test framework from github and removing it locally (#56)

Signed-off-by: zackcam <[email protected]>

Author: zackcam

.github/workflows/ci.yml

@@ -7,6 +7,8 @@ on:
 env:
   CARGO_TERM_COLOR: always
   VALKEY_REPO_URL: https://github.com/valkey-io/valkey.git
+  TEST_FRAMEWORK_REPO: https://github.com/valkey-io/valkey-test-framework
+  TEST_FRAMEWORK_DIR: tests/valkeytests
 
 jobs:
   build-ubuntu-latest:
@@ -41,6 +43,13 @@ jobs:
         git checkout ${{ matrix.server_version }}
         make -j
         cp src/valkey-server ../binaries/${{ matrix.server_version }}/
+    - name: Set up test framework
+      run: |
+        echo "Cloning test framework..."
+        git clone ${{ env.TEST_FRAMEWORK_REPO }}
+        mkdir -p ${{ env.TEST_FRAMEWORK_DIR }}
+        mv valkey-test-framework/src/* ${{ env.TEST_FRAMEWORK_DIR }}/
+        rm -rf valkey-test-framework
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
@@ -100,6 +109,13 @@ jobs:
         make distclean
         make -j SANITIZER=address SERVER_CFLAGS='-Werror' BUILD_TLS=module
         cp src/valkey-server ../binaries/${{ matrix.server_version }}/
+    - name: Set up test framework
+      run: |
+        echo "Cloning test framework..."
+        git clone ${{ env.TEST_FRAMEWORK_REPO }}
+        mkdir -p ${{ env.TEST_FRAMEWORK_DIR }}
+        mv valkey-test-framework/src/* ${{ env.TEST_FRAMEWORK_DIR }}/
+        rm -rf valkey-test-framework
     - name: Set up Python
       uses: actions/setup-python@v3
       with:

.gitignore

@@ -4,3 +4,4 @@ tests/.build
 __pycache__
 test-data
 .attach_pid*
+tests/valkeytests*

build.sh

@@ -57,6 +57,21 @@ else
     cp src/valkey-server ../binaries/$SERVER_VERSION/
 fi
 
+
+TEST_FRAMEWORK_REPO="https://github.com/valkey-io/valkey-test-framework"
+TEST_FRAMEWORK_DIR="tests/valkeytests"
+
+if [ -d "$TEST_FRAMEWORK_DIR" ]; then
+    echo "valkeytest found."
+else
+
+    echo "Cloning test framework..."
+    git clone "$TEST_FRAMEWORK_REPO"
+    mkdir -p "$TEST_FRAMEWORK_DIR"
+    mv "valkey-test-framework/src"/* "$TEST_FRAMEWORK_DIR/"
+    rm -rf valkey-test-framework
+fi
+
 REQUIREMENTS_FILE="requirements.txt"
 
 # Check if pip is available

tests/test_bloom_save_and_restore.py

@@ -130,4 +130,4 @@ def test_rdb_restore_non_bloom_compatibility(self):
 
         assert self.server.num_keys(client=new_client) == 1
         assert new_client.get("string") == b"val"
-        new_server.exit()
+        new_server.exit()