Skip to content
This repository was archived by the owner on Oct 18, 2021. It is now read-only.

Commit 5ca5a2e

Browse files
authored
Use db.version() for test switch (#172)
1 parent 1c89a28 commit 5ca5a2e

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ script:
1818
- 3.0.12/bin/mongod --fork --nopreallocj --dbpath ./data/db --syslog --port 27017
1919
- 3.0.12/bin/mongod --fork --nopreallocj --dbpath ./data/test --syslog --port 27018
2020
- cargo build --verbose
21-
- cargo test --features "mongodb_3_0" --verbose
21+
- cargo test --verbose
2222
- killall mongod
2323
- 3.2.10/bin/mongod --fork --nopreallocj --dbpath ./data/db2 --syslog --port 27017
2424
- 3.2.10/bin/mongod --fork --nopreallocj --dbpath ./data/test2 --syslog --port 27018

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,3 @@ bufstream = "0.1.1"
2828

2929
[dev-dependencies]
3030
nalgebra = "0.10.1"
31-
32-
[features]
33-
default = []
34-
mongodb_3_0 = []

tests/client/db.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ fn create_collection() {
2020

2121
let results = cursor.next_n(5).unwrap();
2222

23-
let v3_0 = cfg!(feature = "mongodb_3_0");
24-
let result_size = if v3_0 { 3 } else { 2 };
23+
let db_version = db.version().unwrap();
24+
let v3_1 = db_version.major <= 3 && db_version.minor <= 1;
25+
26+
let result_size = if v3_1 { 3 } else { 2 };
2527
assert_eq!(result_size, results.len());
2628

27-
if v3_0 {
29+
if v3_1 {
2830
match results[0].get("name") {
2931
Some(&Bson::String(ref name)) => assert_eq!("system.indexes", name),
3032
_ => panic!("Expected BSON string!"),
@@ -62,11 +64,13 @@ fn list_collections() {
6264

6365
let results = cursor.next_n(5).unwrap();
6466

65-
let v3_0 = cfg!(feature = "mongodb_3_0");
66-
let result_size = if v3_0 { 3 } else { 2 };
67+
let db_version = db.version().unwrap();
68+
let v3_1 = db_version.major <= 3 && db_version.minor <= 1;
69+
70+
let result_size = if v3_1 { 3 } else { 2 };
6771
assert_eq!(result_size, results.len());
6872

69-
if v3_0 {
73+
if v3_1 {
7074
match results[0].get("name") {
7175
Some(&Bson::String(ref name)) => assert_eq!("system.indexes", name),
7276
_ => panic!("Expected BSON string!"),
@@ -172,5 +176,5 @@ fn create_and_get_users() {
172176
fn get_version() {
173177
let client = Client::connect("localhost", 27017).unwrap();
174178
let db = client.db("get_version");
175-
let version = db.version().unwrap();
179+
let _ = db.version().unwrap();
176180
}

0 commit comments

Comments
 (0)