diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2020-02-27 09:52:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 09:52:40 +0100 |
| commit | 685dcaa1e6c2d11356a711cf1788db9344713851 (patch) | |
| tree | 3a4b6e44d7162f449669b4369fcb1d481cb41fac | |
| parent | c913be0464421c9fb818cc27969012fcbe318348 (diff) | |
| parent | 2f1a1c3835efefec8de97d3222538a45ccdd257e (diff) | |
| download | redis-685dcaa1e6c2d11356a711cf1788db9344713851.tar.gz | |
Merge pull request #6935 from oranagra/ci_actions_latency
fix github actions failing latency test for active defrag - part 2
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | tests/unit/memefficiency.tcl | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 559ae61d8..cc4991606 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,9 @@ jobs: - name: test run: | sudo apt-get install tcl8.5 - ./runtest --clients 1 --verbose + ./runtest --clients 2 --verbose - test-ubuntu-old: + build-ubuntu-old: runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v1 diff --git a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl index c899103fd..06b0e07d7 100644 --- a/tests/unit/memefficiency.tcl +++ b/tests/unit/memefficiency.tcl @@ -60,6 +60,7 @@ start_server {tags {"defrag"}} { r config set latency-monitor-threshold 5 r latency reset + r config set maxmemory 110mb ;# prevent further eviction (not to fail the digest test) set digest [r debug digest] catch {r config set activedefrag yes} e if {![string match {DISABLED*} $e]} { @@ -166,7 +167,7 @@ start_server {tags {"defrag"}} { for {set j 0} {$j < 500000} {incr j} { $rd read ; # Discard replies } - assert {[r dbsize] == 500010} + assert_equal [r dbsize] 500010 # create some fragmentation for {set j 0} {$j < 500000} {incr j 2} { @@ -175,7 +176,7 @@ start_server {tags {"defrag"}} { for {set j 0} {$j < 500000} {incr j 2} { $rd read ; # Discard replies } - assert {[r dbsize] == 250010} + assert_equal [r dbsize] 250010 # start defrag after 120 ;# serverCron only updates the info once in 100ms |