Update cli version and fix tests. (#81)

* fix: test

* Update cli version.

---------

Co-authored-by: MiniFrenchBread <103425574+MiniFrenchBread@users.noreply.github.com>
This commit is contained in:
peilun-conflux 2024-06-10 22:54:39 +08:00 committed by GitHub
parent 0f52325f67
commit 6383c7ddac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions

View File

@ -4,6 +4,7 @@ import logging
import os import os
import pdb import pdb
import random import random
import re
import shutil import shutil
import subprocess import subprocess
import sys import sys
@ -381,8 +382,10 @@ class TestFramework:
line = line.decode("utf-8") line = line.decode("utf-8")
self.log.debug("line: %s", line) self.log.debug("line: %s", line)
if "root" in line: if "root" in line:
index = line.find("root=") filtered_line = re.sub(r'\x1b\[([0-9,A-Z]{1,2}(;[0-9]{1,2})?(;[0-9]{3})?)?[m|K]?', '', line)
root = line[index + 5 : -1] index = filtered_line.find("root=")
if index > 0:
root = filtered_line[index + 5 : index + 5 + 66]
except Exception as ex: except Exception as ex:
self.log.error("Failed to upload file via CLI tool, output: %s", output_name) self.log.error("Failed to upload file via CLI tool, output: %s", output_name)
raise ex raise ex

View File

@ -17,7 +17,7 @@ ZG_BINARY = "0gchaind.exe" if is_windows_platform() else "0gchaind"
CLIENT_BINARY = "0g-storage-client.exe" if is_windows_platform() else "0g-storage-client" CLIENT_BINARY = "0g-storage-client.exe" if is_windows_platform() else "0g-storage-client"
ZG_GIT_REV = "7bc25a060fab9c17bc9942b6747cd07a668d3042" # v0.1.0 ZG_GIT_REV = "7bc25a060fab9c17bc9942b6747cd07a668d3042" # v0.1.0
CLI_GIT_REV = "1d09ec4f0b9c27428b2357de46b66e8c231b74df" CLI_GIT_REV = "98d74b7e7e6084fc986cb43ce2c66692dac094a6"
@unique @unique
class BuildBinaryResult(Enum): class BuildBinaryResult(Enum):