Commit 2a3d2b6c authored by Ramon Nou's avatar Ramon Nou
Browse files

_process_exists using kill 0 instead of ps (ci) 

restore rocksdb

Removed extra debug line
parent 9c3a1b09

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ gkfs:integration: 
    - export PATH=${PATH}:/usr/local/bin

    - mkdir -p ${BUILD_PATH}/tests/run

    - cd ${BUILD_PATH}/tests/integration

    - ${PYTEST} -v -n 1

    - ${PYTEST} -v -n $(nproc)

          ${INTEGRATION_TESTS_BIN_PATH}/${SUBTEST}

          --basetemp=${BUILD_PATH}/tests/run/${SUBTEST}

          --junit-xml=report.xml
@@ -167,7 +167,7 @@ gkfwd:integration: 
    ## run tests

    - mkdir -p ${BUILD_PATH}/tests/run

    - cd ${BUILD_PATH}/tests/integration

    - ${PYTEST} -v -n 1

    - ${PYTEST} -v -n $(nproc)

          ${INTEGRATION_TESTS_BIN_PATH}/${SUBTEST}

          --basetemp=${BUILD_PATH}/tests/run/${SUBTEST}

          --junit-xml=report.xml

scripts/profiles/0.9.2/default.specs

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ wgetdeps=( 
    ["lz4"]="1.9.3"

    ["capstone"]="4.0.2"

    ["argobots"]="1.1"

    ["rocksdb"]="8.5.4"

    ["rocksdb"]="6.26.1"

    ["json-c"]="0.15-20200726"

)

tests/integration/harness/gkfs.py

+6 −6
Original line number Diff line number Diff line
@@ -149,12 +149,10 @@ def _process_exists(pid): 
    """



    try:

        sh.ps(['-h', '-p', pid])

    except Exception:

        # sh.raises an Exception if the command doesn't return 0

        return False



        os.kill(pid, 0)

        return True

    except OSError:

        return False



def _find_search_paths(additional_paths=None):

    """
@@ -291,6 +289,8 @@ class Daemon: 


        return self







    def wait_until_active(self, pid, timeout, max_lines=50):

        """

        Waits until a GKFS daemon is active or until a certain timeout