commit 46c81b6f77111c15cba319906d296392fc03fd86
from: Sergey Bronnikov <estetus@gmail.com>
via: Sergey Bronnikov <sergeyb@tarantool.org>
date: Sun Jul 07 15:53:20 2024 UTC

tests: remove CAS and RW-register generators

CAS and RW-register generators now is a part of Molly [1][2].

1. https://github.com/ligurio/molly/commit/897a4d92041aabef45cfe2e5d1de692d931d8ed0
2. https://github.com/ligurio/molly/commit/f62394fc3e88e0059d3416a532b6c3ddfb888571

commit - 0b168a024e40f3f1e15364f3fd51c6a21d083168
commit + 46c81b6f77111c15cba319906d296392fc03fd86
blob - a6088cb7099fe48226da2358c23a99c6fd0f3904
blob + 3062a101e7e9148de99791f9b5622539cfd08c77
--- test/tarantool/cas_register_client.lua
+++ test/tarantool/cas_register_client.lua
@@ -1,35 +1,10 @@
 -- Molly client with read, write and CAS operations.
 
-local math = require('math')
 local net_box = require('net.box')
 local molly = require('molly')
 
 local client = molly.client
 
-local function r()
-    return {
-        f = 'read',
-        v = nil,
-    }
-end
-
-local function w()
-    return {
-        f = 'write',
-        v = math.random(1, 10),
-    }
-end
-
-local function cas()
-    return {
-        f = 'cas',
-        v = {
-            math.random(1, 10), -- Old value.
-            math.random(1, 10), -- New value.
-        },
-    }
-end
-
 local space_name = 'register_space'
 
 local cl = client.new()
@@ -119,9 +94,4 @@ end
 
 return {
     client = cl,
-    ops = {
-       r = r,
-       w = w,
-       cas = cas,
-    }
 }
blob - 61e714b5cdb6c251452e2ae8a09be804be7beabd
blob + d0bbf62966a664c083acaab8e7401fba1b233609
--- test/tarantool/rw_register_client.lua
+++ test/tarantool/rw_register_client.lua
@@ -1,23 +1,8 @@
 -- Molly client with read and write operations.
 
-local math = require('math')
 local net_box = require('net.box')
 local molly = require('molly')
 
-local function r()
-    return {
-        f = 'read',
-        v = nil,
-    }
-end
-
-local function w()
-    return {
-        f = 'write',
-        v = math.random(1, 100),
-    }
-end
-
 local space_name = 'rw_register_mc'
 
 local client = molly.client.new()
@@ -83,8 +68,4 @@ end
 
 return {
     client = client,
-    ops = {
-       r = r,
-       w = w,
-    }
 }
blob - 2c47fd7c72aa37296280b3aeb9b65176082334c8
blob + 7cf3de478e829b94f7d571c841fa9cb1fe36b480
--- test/tarantool/tarantool_test.lua
+++ test/tarantool/tarantool_test.lua
@@ -3,6 +3,7 @@ local net_box = require('net.box')
 
 local molly = require('molly')
 local gen = molly.gen
+local tests = molly.tests
 local runner = molly.runner
 
 local cur_dir = fio.pathjoin(fio.dirname(debug.sourcedir()), '?.lua')
@@ -74,9 +75,6 @@ g.test_bank = function()
 end
 
 g.test_cas_register = function()
-    local r = cas_register.ops.r
-    local w = cas_register.ops.w
-    local cas = cas_register.ops.cas
     local test_options = {
         create_reports = true,
         threads = 5,
@@ -86,7 +84,7 @@ g.test_cas_register = function()
     }
     local ok, err = runner.run_test({
         client = cas_register.client,
-        generator = gen.cycle(gen.iter({ r, w, cas, })):take(1000),
+        generator = tests.cas_register_gen():take(1000),
     }, test_options)
     t.assert_equals(err, nil)
     t.assert_equals(ok, true)