Skip to content

Commit 27ecf26

Browse files
Merge pull request #211 from aerospike/3.1.1-release-candidate
3.1.1 release candidate
2 parents 239d2c9 + 5ee2f67 commit 27ecf26

File tree

6 files changed

+91
-10
lines changed

6 files changed

+91
-10
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.0
1+
3.1.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def run(self):
7272
os.environ['ARCHFLAGS'] = '-arch x86_64'
7373
AEROSPIKE_C_VERSION = os.getenv('AEROSPIKE_C_VERSION')
7474
if not AEROSPIKE_C_VERSION:
75-
AEROSPIKE_C_VERSION = '4.3.6'
75+
AEROSPIKE_C_VERSION = '4.3.8'
7676
DOWNLOAD_C_CLIENT = os.getenv('DOWNLOAD_C_CLIENT')
7777
AEROSPIKE_C_HOME = os.getenv('AEROSPIKE_C_HOME')
7878
PREFIX = None

src/main/aerospike.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ AerospikeConstants operator_constants[] = {
9393
MOD_INIT(aerospike)
9494
{
9595

96-
const char version[8] = "3.1.0";
96+
const char version[8] = "3.1.1";
9797
// Makes things "thread-safe"
9898
PyEval_InitThreads();
9999
int i = 0;

src/main/policy_config.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ as_status set_optional_key(as_policy_key* target_ptr, PyObject* py_policy, const
564564
}
565565

566566
uint32_t out_uint32;
567-
as_status status = get_uint32_value(py_policy, &out_uint32);
567+
as_status status = get_uint32_value(py_policy_val, &out_uint32);
568568
if (status != AEROSPIKE_OK) {
569569
return status;
570570
}
@@ -584,7 +584,7 @@ as_status set_optional_replica(as_policy_replica* target_ptr, PyObject* py_polic
584584
}
585585

586586
uint32_t out_uint32;
587-
as_status status = get_uint32_value(py_policy, &out_uint32);
587+
as_status status = get_uint32_value(py_policy_val, &out_uint32);
588588
if (status != AEROSPIKE_OK) {
589589
return status;
590590
}
@@ -604,7 +604,7 @@ as_status set_optional_commit_level(as_policy_commit_level* target_ptr, PyObject
604604
}
605605

606606
uint32_t out_uint32;
607-
as_status status = get_uint32_value(py_policy, &out_uint32);
607+
as_status status = get_uint32_value(py_policy_val, &out_uint32);
608608
if (status != AEROSPIKE_OK) {
609609
return status;
610610
}
@@ -624,7 +624,7 @@ as_status set_optional_consistency_level(as_policy_consistency_level* target_ptr
624624
}
625625

626626
uint32_t out_uint32;
627-
as_status status = get_uint32_value(py_policy, &out_uint32);
627+
as_status status = get_uint32_value(py_policy_val, &out_uint32);
628628
if (status != AEROSPIKE_OK) {
629629
return status;
630630
}
@@ -644,7 +644,7 @@ as_status set_optional_gen(as_policy_gen* target_ptr, PyObject* py_policy, const
644644
}
645645

646646
uint32_t out_uint32;
647-
as_status status = get_uint32_value(py_policy, &out_uint32);
647+
as_status status = get_uint32_value(py_policy_val, &out_uint32);
648648
if (status != AEROSPIKE_OK) {
649649
return status;
650650
}
@@ -664,7 +664,7 @@ as_status set_optional_exists(as_policy_exists* target_ptr, PyObject* py_policy,
664664
}
665665

666666
uint32_t out_uint32;
667-
as_status status = get_uint32_value(py_policy, &out_uint32);
667+
as_status status = get_uint32_value(py_policy_val, &out_uint32);
668668
if (status != AEROSPIKE_OK) {
669669
return status;
670670
}

test/new_tests/test_base_class.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ def get_tls_info():
5353
config.read("config.conf")
5454

5555
if (config.has_option('tls', 'enable') and (
56-
config.getboolean('tls', 'enable'))):
56+
config.get('tls', 'enable') != '' and
57+
config.get('tls', 'enable') != '0')):
5758
TestBaseClass.using_tls = True
5859
tls_dict['enable'] = True
5960

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# -*- coding: utf-8 -*-
2+
3+
import pytest
4+
import sys
5+
import json
6+
from .test_base_class import TestBaseClass
7+
from aerospike import exception as e
8+
9+
host, user, password = TestBaseClass.get_hosts()
10+
using_auth = user or password
11+
aerospike = pytest.importorskip("aerospike")
12+
try:
13+
import aerospike
14+
except:
15+
print("Please install aerospike python client.")
16+
sys.exit(1)
17+
18+
19+
def test_setting_key():
20+
key_val = aerospike.POLICY_KEY_SEND
21+
read_policy = {'key': key_val}
22+
policies = {'read': read_policy}
23+
config = {'hosts': host, 'policies': policies}
24+
client = aerospike.client(config)
25+
26+
27+
def test_setting_consistency():
28+
cons_val = aerospike.POLICY_CONSISTENCY_ONE
29+
read_policy = {'consistency_level': cons_val}
30+
policies = {'read': read_policy}
31+
config = {'hosts': host, 'policies': policies}
32+
client = aerospike.client(config)
33+
34+
35+
def test_setting_consistency():
36+
replica_val = aerospike.POLICY_REPLICA_MASTER
37+
read_policy = {'replica': replica_val}
38+
policies = {'read': read_policy}
39+
config = {'hosts': host, 'policies': policies}
40+
client = aerospike.client(config)
41+
42+
43+
def test_setting_consistency():
44+
replica_val = aerospike.POLICY_REPLICA_MASTER
45+
read_policy = {'replica': replica_val}
46+
policies = {'read': read_policy}
47+
config = {'hosts': host, 'policies': policies}
48+
client = aerospike.client(config)
49+
50+
51+
def test_setting_conmmit_level():
52+
commit_val = aerospike.POLICY_COMMIT_LEVEL_ALL
53+
write_policy = {'commit_level': commit_val}
54+
policies = {'write': write_policy}
55+
config = {'hosts': host, 'policies': policies}
56+
client = aerospike.client(config)
57+
58+
59+
def test_setting_exists():
60+
exists_val = aerospike.POLICY_EXISTS_CREATE
61+
write_policy = {'commit_level': exists_val}
62+
policies = {'write': write_policy}
63+
config = {'hosts': host, 'policies': policies}
64+
client = aerospike.client(config)
65+
66+
67+
def test_setting_gen():
68+
gen_val = aerospike.POLICY_GEN_IGNORE
69+
write_policy = {'commit_level': gen_val}
70+
policies = {'write': write_policy}
71+
config = {'hosts': host, 'policies': policies}
72+
client = aerospike.client(config)
73+
74+
75+
def test_setting_wrong_type():
76+
write_policy = {'commit_level': [1, 2, 3]}
77+
policies = {'write': write_policy}
78+
config = {'hosts': host, 'policies': policies}
79+
with pytest.raises(e.ParamError):
80+
client = aerospike.client(config)

0 commit comments

Comments
 (0)