@@ -35,7 +35,6 @@ fn create_proxies_and_configs() -> (Vec<ProxyDrop>, String) {
35
35
Some ( v) => v. into_string ( ) . unwrap ( ) ,
36
36
None => "http://127.0.0.1:8474" . to_string ( ) ,
37
37
} ;
38
-
39
38
toxiproxy_url = toxiproxy_url. strip_prefix ( "http://" ) . unwrap ( ) . to_string ( ) ;
40
39
41
40
// Create toxiproxy client and populate proxies
@@ -50,7 +49,7 @@ fn create_proxies_and_configs() -> (Vec<ProxyDrop>, String) {
50
49
TOXI_ADDR . get_or_init ( || toxi_addr) ;
51
50
} ) ;
52
51
53
- let local_url = match std:: env:: var_os ( "NODE_LOCAL_CACHE " ) {
52
+ let local_url = match std:: env:: var_os ( "MEMCACHED_ADDR " ) {
54
53
Some ( v) => v. into_string ( ) . unwrap ( ) ,
55
54
None => "127.0.0.1:11211" . to_string ( ) , // use IPV4 so that it resolves to a single Server
56
55
} ;
@@ -127,12 +126,26 @@ mod tests {
127
126
let values = vec ! [ "value1" , "value2" , "value3" ] ;
128
127
let kv: Vec < ( & str , & str ) > = keys. clone ( ) . into_iter ( ) . zip ( values) . collect ( ) ;
129
128
129
+ let mut clean_client = rt. block_on ( async {
130
+ async_memcached:: Client :: new ( "tcp://127.0.0.1:11211" . to_string ( ) )
131
+ . await
132
+ . unwrap ( )
133
+ } ) ;
134
+
135
+ println ! ( "toxic_local_url in test 1: {}" , toxic_local_addr) ;
130
136
let mut toxic_client =
131
137
rt. block_on ( async { async_memcached:: Client :: new ( toxic_local_url) . await . unwrap ( ) } ) ;
132
138
139
+ let response = rt. block_on ( async { clean_client. version ( ) . await } ) ;
140
+ println ! ( "test 1 version response from clean client: {:?}" , response) ;
141
+ assert ! ( response. is_ok( ) ) ;
142
+ let response = rt. block_on ( async { toxic_client. version ( ) . await } ) ;
143
+ println ! ( "test 1 version response from toxic client: {:?}" , response) ;
144
+ assert ! ( response. is_ok( ) ) ;
145
+
133
146
for key in & keys {
134
- let _ = rt. block_on ( async { toxic_client . delete ( key) . await } ) ;
135
- let result = rt. block_on ( async { toxic_client . get ( key) . await } ) ;
147
+ let _ = rt. block_on ( async { clean_client . delete ( key) . await } ) ;
148
+ let result = rt. block_on ( async { clean_client . get ( key) . await } ) ;
136
149
assert_eq ! ( result, Ok ( None ) ) ;
137
150
}
138
151
@@ -179,12 +192,13 @@ mod tests {
179
192
. unwrap ( )
180
193
} ) ;
181
194
195
+ println ! ( "toxic_local_url in test 2: {}" , toxic_local_addr) ;
182
196
let mut toxic_client =
183
197
rt. block_on ( async { async_memcached:: Client :: new ( toxic_local_url) . await . unwrap ( ) } ) ;
184
198
185
199
for key in & keys {
186
- let _ = rt. block_on ( async { toxic_client . delete ( key) . await } ) ;
187
- let result = rt. block_on ( async { toxic_client . get ( key) . await } ) ;
200
+ let _ = rt. block_on ( async { clean_client . delete ( key) . await } ) ;
201
+ let result = rt. block_on ( async { clean_client . get ( key) . await } ) ;
188
202
assert_eq ! ( result, Ok ( None ) ) ;
189
203
}
190
204
@@ -193,6 +207,13 @@ mod tests {
193
207
194
208
let byte_limit = multiset_command. len ( ) - 10 ; // First two commands should be intact, last one cut off
195
209
210
+ let response = rt. block_on ( async { clean_client. version ( ) . await } ) ;
211
+ println ! ( "test 2 version response from clean client: {:?}" , response) ;
212
+ assert ! ( response. is_ok( ) ) ;
213
+ let response = rt. block_on ( async { toxic_client. version ( ) . await } ) ;
214
+ println ! ( "test 2 version response from toxic client: {:?}" , response) ;
215
+ assert ! ( response. is_ok( ) ) ;
216
+
196
217
let _ = toxic_proxy
197
218
. with_limit_data ( "upstream" . into ( ) , byte_limit as u32 , 1.0 )
198
219
. apply ( || {
@@ -260,12 +281,20 @@ mod tests {
260
281
. unwrap ( )
261
282
} ) ;
262
283
284
+ println ! ( "toxic_local_url in test 3: {}" , toxic_local_addr) ;
263
285
let mut toxic_client =
264
286
rt. block_on ( async { async_memcached:: Client :: new ( toxic_local_url) . await . unwrap ( ) } ) ;
265
287
288
+ let response = rt. block_on ( async { clean_client. version ( ) . await } ) ;
289
+ println ! ( "test 3 version response from clean client: {:?}" , response) ;
290
+ assert ! ( response. is_ok( ) ) ;
291
+ let response = rt. block_on ( async { toxic_client. version ( ) . await } ) ;
292
+ println ! ( "test 3 version response from toxic client: {:?}" , response) ;
293
+ assert ! ( response. is_ok( ) ) ;
294
+
266
295
for key in & keys {
267
- let _ = rt. block_on ( async { toxic_client . delete ( key) . await } ) ;
268
- let result = rt. block_on ( async { toxic_client . get ( key) . await } ) ;
296
+ let _ = rt. block_on ( async { clean_client . delete ( key) . await } ) ;
297
+ let result = rt. block_on ( async { clean_client . get ( key) . await } ) ;
269
298
assert_eq ! ( result, Ok ( None ) ) ;
270
299
}
271
300
0 commit comments